[#650] TableLayout changed

open-learning-exchange · Jun 22, 2017 · faa311a · faa311a
1 parent 26ddabf
commit faa311a
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 33 deletions.
diff --git a/app/MyApp/app/views/CoursesStatistics.js b/app/MyApp/app/views/CoursesStatistics.js
@@ -9,6 +9,7 @@ $(function() {
         initialize: function() {
 
         },
+
         render: function() {
             var memberName=[]
             var memberStep= []
@@ -17,6 +18,7 @@ $(function() {
             var stepid = []
             var totalerrors = []
             var totalFailStatus = []
+            var you = []
                for(var i = 0; i <this.model.attributes.members.length; i++){
                     var statisticscourseProgress = new App.Collections.membercourseprogresses()
                     statisticscourseProgress.memberId = this.model.attributes.members[i];
@@ -30,7 +32,6 @@ $(function() {
                     var member = statisticscourseProgress.models[0].attributes.memberId
                     var failarr = []
                     var arr = 0
-
                     var arrtotalerrors = []
                     for (var k = 0; k < memberStep.length; k++)
                     {
@@ -53,6 +54,7 @@ $(function() {
                         async: false
                     });
                    memberName.push(members.toJSON().firstName + ' ' + members.toJSON().lastName)
+
                 }
                 for (var y = 0; y < memberStep.length; y++) {
                         var courseSteps = new App.Models.CourseStep()
@@ -63,14 +65,23 @@ $(function() {
                         stepid.push(courseSteps.attributes._id)
                         stepName.push(courseSteps.attributes.title)
                 };
-                 this.vars.stepId =  stepid;
-                 this.vars.stepName =  stepName;
-                 this.vars.member_Name =  memberName;
-                 this.vars.member_sstatus = failarr;
-                 this.vars.steps = memberStep;
-                 this.vars.Totalfailstat = totalFailStatus;
-                 this.vars.Totalerrors = totalerrors;
-                 this.$el.html(_.template(this.template,this.vars))
+                var totalMemberstepError = []
+                for (var q = 0; q < memberStep.length; q++) {
+                     var total = 0
+                    for (var p = 0; p< this.model.attributes.members.length; p++) {
+                        total = total + totalFailStatus[p][q]
+                    }
+                    totalMemberstepError.push(total)
+                }
+                this.vars.stepId =  stepid;
+                this.vars.stepName =  stepName;
+                this.vars.member_Name =  memberName;
+                this.vars.member_sstatus = failarr;
+                this.vars.steps = memberStep;
+                this.vars.Totalfailstat = totalFailStatus;
+                this.vars.Totalerrors = totalerrors;
+                this.vars.TotalmemberSteperror = totalMemberstepError
+                this.$el.html(_.template(this.template,this.vars))
         }
 
 

diff --git a/app/MyApp/index.html b/app/MyApp/index.html
@@ -1193,36 +1193,40 @@ <h3><%=languageDict.attributes.Configurations%></h3>
     </script>
 
     <script type="text/html" id="template-CourseStatistics">
-        <table class="table table-striped">
-            <tr >
-            <th></th>
-                <% for(var k = 0; k < Totalfailstat.length; k++) {%>
-                    <th style ="color: #006400;"> <%=member_Name[k]%></th>
-                <%}%>
-
-            </tr>
+            <table class="table table-striped">
             <tr>
-                <th><%=App.languageDict.attributes.Steps%></th>
-                <% for(var k = 0; k < Totalfailstat.length; k++) {%>
-                    <th>Error</th>
-                <%}%>
+                <th colspan = ""><%=App.languageDict.attributes.Members%></th>
+                <th></th>
+                <th colspan = "50v"><center><%=App.languageDict.attributes.Steps%></center></th>
             </tr>
-              <% for(var i = 0; i < stepName.length; i++) {%><tr>
+            <tr>
+                <th></th>
+                <th></th>
+                    <% for(var i = 0; i < stepName.length; i++) {%>
                         <%var a = i + 1%>
-                           <td><a href ="#CourseStepStatistics/<%=stepId[i]%>"><b><%=a%></b></a></td>
-                       <% for(var j = 0; j < member_Name.length; j++) {%>
-                            <td><%=Totalfailstat[j][i]%></td>
-                        <% } %>
-                <%}%>
-
+                        <th><a href ="#CourseStepStatistics/<%=stepId[i]%>"><%=a%></a>
+                        </th>
+                    <% } %>
             </tr>
-            <tr>
-                <td><b>Total</b></td>
-                <% for(var i = 0; i < member_Name.length; i++) {%>
-                    <td><b><%=Totalerrors[i]%></b></td>
+            <% for(var k = 0; k < Totalfailstat.length; k++) {%>
+                <tr>
+                    <td style ="color: #006400;"><b><%=member_Name[k]%></b></td>
+                    <td style="color: red;"><b><%=Totalerrors[k]%></b></td>
+                   <% for(var j = 0; j < member_sstatus.length; j++) {%>
+                            <td class = "attemptError"><%=Totalfailstat[k][j]%></td>
+                    <% } %>
+                </tr>
+            <% } %>
+             <tr>
+                <td><b>Total Errors</b></td>
+                <td></td>
+                <% for(var i = 0; i < stepName.length; i++) {%>
+                    <td style="color: red;"><b><%=TotalmemberSteperror[i]%></b></td>
                 <%}%>
             </tr>
-        </table>
+
+
+            </table>
     </script>
 
     <script type="text/html" id="template-CourseStepStatistics">