Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec

Apollo/api/application/models/Reports_model.php

@@ -1138,6 +1138,10 @@ if($feeDetails)
         }
 
 
+        //print_r( $this->db->last_query());  
+        //die();
+
+
         return $result_array;
      
     }

Apollo/assets/js/controllers/FeeCollected_reportCtrl.js

@@ -175,9 +175,19 @@ $scope.tod = to_dt;
               $scope.newreglist = response.data.details;
               $scope.isShow=true;
               $scope.isLoaderShow=false;
+              $scope.Totalfee =0;
 
               console.log($scope.newreglist);
 
+
+               angular.forEach(($scope.newreglist),function(newreglist,key)
+               {
+
+                       console.log(newreglist)
+
+                       $scope.Totalfee= parseFloat($scope.Totalfee)+parseFloat(newreglist.Total);
+               });
+
             }
 
             else

Apollo/assets/views/feecollected.html

@@ -172,6 +172,7 @@
                <th style="font-size: 12px;">Waiver</th>      
                <th style="font-size: 12px;">Credit/Debit Card</th>
                <th style="font-size: 12px;">Total</th>
+
               <!-- <th style="font-size: 12px;">Amount</th>
                <th style="font-size: 12px;">Action</th> -->
             </tr>
@@ -186,10 +187,23 @@
                 <td>{{p.WAIVER}}</td>       
                 <td>{{p.Card}}</td>
                 <td>{{p.Total}}</td>
-                
+ 
             </tr>
             
          </tbody>
+
+
+                   <tfoot>
+                           <!--  <td></td>
+                            <td></td>style="font-size:35px;"
+                            <td></td>
+                            <td></td> -->
+                            <td colspan="7" align="right"><span style="font-size:15px;font-weight:bold">Total</span></td>
+                            <!-- <td></td>
+                            <td></td> -->
+                            <td><span style="font-size:15px;font-weight:bold">{{Totalfee}}</span></td>
+                          
+                  </tfoot>
       </table>
    </div>
 </div>