Report card control

.gitignore

@@ -1,2 +1,6 @@
+<<<<<<< HEAD
 /build/
-/dist/
+=======
+/build/
+/dist/
+>>>>>>> upstream/master

nbproject/private/private.properties

@@ -1,18 +1,29 @@
 <<<<<<< HEAD
+deploy.ant.properties.file=C:\\Users\\Julio\\AppData\\Roaming\\NetBeans\\8.1\\config\\GlassFishEE6\\Properties\\gfv3-925999663.properties
+j2ee.platform.is.jsr109=true
+j2ee.server.domain=C:/Users/Julio/AppData/Roaming/NetBeans/8.1/config/GF_4.1.1/domain1
+j2ee.server.home=C:/Program Files/glassfish-4.1.1/glassfish
+j2ee.server.instance=[C:\\Program Files\\glassfish-4.1.1\\glassfish;C:\\Program Files\\glassfish-4.1.1\\glassfish\\domains\\domain1]deployer:gfv3ee6wc:localhost:4848
+j2ee.server.middleware=C:/Program Files/glassfish-4.1.1
+selected.browser=Chrome.INTEGRATED
+user.properties.file=C:\\Users\\Julio\\AppData\\Roaming\\NetBeans\\8.1\\build.properties
+=======
+<<<<<<< HEAD
 deploy.ant.properties.file=C:\\Users\\denis\\AppData\\Roaming\\NetBeans\\8.0.2\\config\\GlassFishEE6\\Properties\\gfv3-505386059.properties
 j2ee.platform.is.jsr109=true
 j2ee.server.domain=C:/Users/denis/AppData/Roaming/NetBeans/8.0.2/config/GF_4.1/domain1
 =======
-deploy.ant.properties.file=C:\\Users\\Anthony\\AppData\\Roaming\\NetBeans\\8.0\\config\\GlassFishEE6\\Properties\\gfv31989460270.properties
+deploy.ant.properties.file=C:\\Users\\Julio\\AppData\\Roaming\\NetBeans\\8.1\\config\\GlassFishEE6\\Properties\\gfv3-925999663.properties
 j2ee.platform.is.jsr109=true
-j2ee.server.domain=C:/Users/Anthony/AppData/Roaming/NetBeans/8.0/config/GF_4.0/domain1
+j2ee.server.domain=C:/Users/Julio/AppData/Roaming/NetBeans/8.1/config/GF_4.1.1/domain1
 >>>>>>> upstream/master
 j2ee.server.home=C:/Program Files/glassfish-4.0/glassfish
-j2ee.server.instance=[C:\\Program Files\\glassfish-4.0\\glassfish;C:\\Program Files\\glassfish-4.0\\glassfish\\domains\\domain1]deployer:gfv3ee6:localhost:4848
-j2ee.server.middleware=C:/Program Files/glassfish-4.0
+j2ee.server.instance=[C:\\Program Files\\glassfish-4.1.1\\glassfish;C:\\Program Files\\glassfish-4.1.1\\glassfish\\domains\\domain1]deployer:gfv3ee6wc:localhost:4848
+j2ee.server.middleware=C:/Program Files/glassfish-4.1.1
 selected.browser=Chrome
 <<<<<<< HEAD
 user.properties.file=C:\\Users\\denis\\AppData\\Roaming\\NetBeans\\8.0.2\\build.properties
 =======
-user.properties.file=C:\\Users\\Anthony\\AppData\\Roaming\\NetBeans\\8.0\\build.properties
+user.properties.file=C:\\Users\\Julio\\AppData\\Roaming\\NetBeans\\8.1\\build.properties
+>>>>>>> upstream/master
 >>>>>>> upstream/master

nbproject/private/private.xml

@@ -3,11 +3,9 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/C:/Users/Anthony/Documents/SisII/mimiSisII/MiniSis/web/components/user.service/user.service.js</file>
-            <file>file:/C:/Users/Anthony/Documents/SisII/mimiSisII/MiniSis/web/components/task-list/task-list.js</file>
-            <file>file:/C:/Users/Anthony/Documents/SisII/mimiSisII/MiniSis/web/components/user-login/user-login.js</file>
-            <file>file:/C:/Users/Anthony/Documents/SisII/mimiSisII/MiniSis/web/index.html</file>
-            <file>file:/C:/Users/Anthony/Documents/SisII/mimiSisII/MiniSis/web/components/task-list/task-list.html</file>
+            <file>file:/C:/Users/Julio/Documents/NetBeansProjects/MiniSis/src/java/org/umss/sisii/minisis/resource/UserResource.java</file>
+            <file>file:/C:/Users/Julio/Documents/NetBeansProjects/MiniSis/web/app.js</file>
+            <file>file:/C:/Users/Julio/Documents/NetBeansProjects/MiniSis/web/index.html</file>
         </group>
     </open-files>
 </project-private>

nbproject/project.properties

@@ -34,11 +34,15 @@ j2ee.compile.on.save=true
 j2ee.copy.static.files.on.save=true
 j2ee.deploy.on.save=true
 j2ee.platform=1.7-web
+<<<<<<< HEAD
+=======
 j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
+>>>>>>> upstream/master
+j2ee.platform.classpath=${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/cdi-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.middleware}/mq/lib/jaxm-api.jar
 j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar
 j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar
-j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar
-j2ee.platform.wsimport.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api-osgi.jar
+j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar
+j2ee.platform.wsimport.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar
 j2ee.platform.wsit.classpath=
 j2ee.server.type=gfv3ee6
 jar.compress=false

src/java/org/umss/sisii/minisis/database/DBManager.java

@@ -35,7 +35,7 @@ public class DBManager {
 
     private DBManager() {
         url = "jdbc:postgresql://localhost:5432/MiniSiss";
-        password = "postgresql";
+        password = "julio";
         postgresUser = "postgres";
         conectar();
     }

src/java/org/umss/sisii/minisis/resource/UserResource.java

@@ -1,3 +1,4 @@
+
 package org.umss.sisii.minisis.resource;
 
 import java.util.List;

web/WEB-INF/glassfish-web.xml

@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
 <glassfish-web-app error-url="">
+<<<<<<< HEAD
+  <context-root>/MiniSis</context-root>
+=======
   <context-root>/minisissII</context-root>
+>>>>>>> upstream/master
   <class-loader delegate="true"/>
   <jsp-config>
     <property name="keepgenerated" value="true">

web/app.js

@@ -1,9 +1,13 @@
 (function () {
     'use strict';
+
+
+
     var modules = [
         'ngNewRouter',
         'app.userLogin',
         'app.task',
+        'app.userReportcard',
         'app.userService'
     ];
 
@@ -21,6 +25,9 @@
             },
             {
                 path: '/taskList', component: 'taskList'
+            },
+            {
+                path: '/userReportcard', component: 'userReportcard'
             }
         ]);
     };

web/components/user-reportcard/user-reportcard.html

@@ -0,0 +1,20 @@
+<div id="userreportcardtemplate">
+    <table class="table table-hover">    
+        <thead>
+            <tr>
+                <th>Nro.</th>
+                <th>name</th>
+                <th>score</th>
+            </tr>
+        </thead>
+        <tbody>
+             <tr ng-repeat="report in userReportcard.reportcards track by $index">
+                <td>
+                    <a ng-href="/taskdetails">{{$index}}</a>
+                </td>
+                <td>{{report.name}}</td>
+                <td>{{report.score}}</td>
+            </tr>
+        </tbody>
+    </table>
+</div>

web/components/user-reportcard/user-reportcard.js

@@ -0,0 +1,33 @@
+(function(){
+    'use strict';
+    angular.module('app.userReportcard',[])
+            .controller('UserReportcardController',UserReportcardController);
+    UserReportcardController.$inject = ['$routeParams','UserService'];
+
+    function UserReportcardController($routeParams, UserService){
+        var vm  = this;
+        vm.reportcards = [
+
+            { name:"Resumen Capitulo 1", score:70},
+            {name:"Resumen Capitulo 2", score:50},
+            {name:"Resumen Capitulo 3", score:40},
+            {name:"Resumen Capitulo 4", score:30},
+             { name:"Resumen Capitulo 5", score:20},
+            {name:"Resumen Capitulo 6", score:10},
+            {name:"Resumen Capitulo 7", score:80},
+            {name:"Resumen Capitulo 8", score:90}
+        ];
+
+       // UserService.getReportcard(onSuccess, onError);
+
+        function onSuccess(data){
+            vm.reportcards = data.data;
+        }
+
+        function onError(){
+            console.log('error en la respuesta');
+        }
+
+
+    } 
+})();

web/components/users/users.service.js

@@ -0,0 +1,23 @@
+(function(){
+    'use strict';
+
+    angular.module('app.userService', [])
+            .service('UserService', UserService);
+    UserService.$inject = ['$http'];
+
+    function UserService($http){
+        var service = {
+            authentify:authentify
+        };
+
+        function authentify(onSuccess, onError){
+            $http({
+               method:'POST',
+               url:'http://localhost:8080/rapp/api/login',
+               data:user
+            }).then(onSuccess, onError);
+        }
+
+        return service;
+    } 
+})();