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

Apollo/api/application/config/routes.php

@@ -242,9 +242,9 @@ $route['updateSubjectDetails'] = 'Subject_Controller/updateSubjectDetails';
 $route['addSubjectDetails'] = 'Subject_Controller/addSubjectDetails';
 
 // session mater
-$route['addSessionMaterDetails'] = 'SessionMater_Controller/addSessionMaterDetails';
+$route['addSessionMasterDetails'] = 'SessionMaster_Controller/addSessionMasterDetails';
-$route['getSessionMaterDetails'] = 'SessionMater_Controller/getSessionMaterDetails';
+$route['getSessionMasterDetails'] = 'SessionMaster_Controller/getSessionMasterDetails';
-$route['updateSessionMaterDetails'] = 'SessionMater_Controller/updateSessionMaterDetails';
+$route['updateSessionMasterDetails'] = 'SessionMaster_Controller/updateSessionMasterDetails';
 
 // session schedule
 $route['addSessionScheduleDetails'] = 'SessionSchedule_Controller/addSessionScheduleDetails';

Apollo/api/application/controllers/SessionMaster_Controller.php

@@ -5,7 +5,7 @@
  * Date: 2/7/18
  * Time: 10:37 AM
  */
-class SessionMater_Controller extends REST_Controller {
+class SessionMaster_Controller extends REST_Controller {
 
     function __construct()
     {
@@ -14,11 +14,11 @@ class SessionMater_Controller extends REST_Controller {
 
         // Configure limits on our controller methods
         // Ensure you have created the 'limits' table and enabled 'limits' within application/config/rest.php
-        $this->methods['addSessionMaterDetails_post']['limit'] = 100;  // 50 requests per hour per user/key
+        $this->methods['addSessionMasterDetails_post']['limit'] = 100;  // 50 requests per hour per user/key
-        $this->methods['getSessionMaterDetails_post']['limit'] = 500; // 50 requests per hour per user/key
+        $this->methods['getSessionMasterDetails_post']['limit'] = 500; // 50 requests per hour per user/key
-        $this->methods['updateSessionMaterDetails_post']['limit'] = 500;// 500 requests per hour per user/key
+        $this->methods['updateSessionMasterDetails_post']['limit'] = 500;// 500 requests per hour per user/key
         // load the model
-        $this->load->model('SeesionMaster_model', 'sessionM_model');
+        $this->load->model('SessionMaster_model', 'sessionM_model');
 
     }
 
@@ -27,7 +27,7 @@ class SessionMater_Controller extends REST_Controller {
      * created by kms
      * */
 
-    public function addSessionMaterDetails_post()
+    public function addSessionMasterDetails_post()
     {
         $now = new DateTime();
         $now->setTimezone(new DateTimezone('Asia/Kolkata'));
@@ -61,7 +61,7 @@ class SessionMater_Controller extends REST_Controller {
      * get session master details
      * created by kms
      * */
-    public function getSessionMaterDetails_post()
+    public function getSessionMasterDetails_post()
     {
         $requestedBy = $this->post('requestedBy');
         $branchCode = $this->post('branchCode');
@@ -87,7 +87,7 @@ class SessionMater_Controller extends REST_Controller {
      * update the session master details
      * created by kms
      * */
-    public function updateSessionMaterDetails_post()
+    public function updateSessionMasterDetails_post()
     {
         $now = new DateTime();
         $now->setTimezone(new DateTimezone('Asia/Kolkata'));

Apollo/api/application/models/Broadcast_model.php

@@ -104,7 +104,7 @@ class Broadcast_model extends CI_Model {
             $courseDetails = $courDetails->result();
             $resultArr['Course'] = $courseDetails;
             // Batch Details
-            $this->db->select('t3.BatchName, t3.BatchCode');
+            $this->db->select('t3.BatchName, t3.BatchCode,t3.BatchDate');
             $this->db->from('' . BATCH . ' as t3');
             $this->db->where('t3.UniversityID', $clip->UniversityID);
             $this->db->where('t3.IsActive', 1);

Apollo/api/application/models/SessionMaster_model.php

@@ -7,8 +7,7 @@
  */
 defined('BASEPATH') OR exit('No direct script access allowed');
 
-class SeesionMaster_model extends CI_Model {
+class SessionMaster_model extends CI_Model {
-
 
     /*
     * Add session master details

Apollo/api/application/models/StatusUpdation_model.php

@@ -500,7 +500,7 @@ class StatusUpdation_model extends CI_Model {
             $courseDetails = $courDetails->result();
             $resultArr['Course'] = $courseDetails;
             // Batch Details
-            $this->db->select('t3.BatchName, t3.BatchCode');
+            $this->db->select('t3.BatchName, t3.BatchCode,t3.BatchDate');
             $this->db->from('' . BATCH . ' as t3');
             $this->db->where('t3.UniversityID', $clip->UniversityID);
             $this->db->where('t3.IsActive', 1);

Apollo/assets/js/controllers/answerBookletStatusCtrl.js

@@ -1,6 +1,6 @@
 'use strict';
 /*** controller for Wizard Form example***/
-app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie) {
+app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', 'dateListDescService', function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie, dateListDescService) {
 
     /**
     * Answer Booklet status update search 
@@ -105,6 +105,13 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
         $scope.searchData.Batch = '';
         $scope.courseData = name.Course;
         $scope.batchData = name.Batch;
+        //call service for array list in desc order based on date
+        angular.forEach($scope.batchData,function (values,key) {
+            var parts = values.BatchDate.split("-");
+            values.givenDateObject=new Date(parts[2], parts[1] - 1, parts[0]);
+        });
+        $scope.batchData=dateListDescService.getOrderByList($scope.batchData);
+        // end
         $scope.OpenWindowStatus = false;
         $scope.getSearch();
     };

Apollo/assets/js/controllers/applicationStatusCtrl.js

@@ -1,6 +1,6 @@
 'use strict';
 /*** controller for Wizard Form example***/
-app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie) {
+app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', 'dateListDescService', function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie ,dateListDescService) {
 
     /**
     * Application status update search / Document status update
@@ -135,6 +135,13 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
         $scope.searchData.Batch = '';
         $scope.courseData = name.Course;
         $scope.batchData = name.Batch;
+        //call service for array list in desc order based on date
+        angular.forEach($scope.batchData,function (values,key) {
+            var parts = values.BatchDate.split("-");
+            values.givenDateObject=new Date(parts[2], parts[1] - 1, parts[0]);
+        });
+        $scope.batchData=dateListDescService.getOrderByList($scope.batchData);
+        // end
         $scope.OpenWindowStatus = false;
         $scope.getSearch();
     };

Apollo/assets/js/controllers/batchCtrl.js

@@ -4,7 +4,7 @@
  * Simple table with sorting and filtering on AngularJS
  */
 
-app.controller('batchCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state", function ($scope,$rootScope,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state) {
+app.controller('batchCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state", "dateListDescService", function ($scope,$rootScope,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state, dateListDescService) {
     $scope.myModel = {
         "batchCode": "",
         "batchName": "",
@@ -259,13 +259,18 @@ app.controller('batchCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTabl
 
                 $scope.emptyData=true;
                 $scope.loader=true;
-
                 $scope.data = response.data.details;
+                // call service for make list in desc order based on date
+                angular.forEach($scope.data,function (value,key) {
+                    var parts = value.BatchDate.split("-");
+                    value.givenDateObject=new Date(parts[2], parts[1] - 1, parts[0]);
+
+                });
+                // end service call
+                $scope.data=dateListDescService.getOrderByList($scope.data);
 
                 $scope.university=response.data.universityDetails;
 
-
-
             } else {
                 $scope.emptyData=false;
                 $scope.loader=true;

Apollo/assets/js/controllers/certificationStatusCtrl.js

@@ -1,6 +1,6 @@
 'use strict';
 /*** controller for Wizard Form example***/
-app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie) {
+app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', 'dateListDescService', function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie, dateListDescService) {
 
     /**
     * Certification status update search / Mark card status update
@@ -131,6 +131,13 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
         $scope.searchData.Batch = '';
         $scope.courseData = name.Course;
         $scope.batchData = name.Batch;
+        //call service for array list in desc order based on date
+        angular.forEach($scope.batchData,function (values,key) {
+            var parts = values.BatchDate.split("-");
+            values.givenDateObject=new Date(parts[2], parts[1] - 1, parts[0]);
+        });
+        $scope.batchData=dateListDescService.getOrderByList($scope.batchData);
+        // end
         $scope.OpenWindowStatus = false;
         $scope.getSearch();
     };

Apollo/assets/js/controllers/feesStatusCtrl.js

@@ -3,7 +3,7 @@
  * controllers for ng-table
  * Simple table with sorting and filtering on AngularJS
  */
-app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state", "installmentService", "SweetAlert", function ($scope,$rootScope,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state,installmentService,SweetAlert) {
+app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state", "installmentService", "SweetAlert", "dateListDescService", function ($scope,$rootScope,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state,installmentService,SweetAlert,dateListDescService) {
     $scope.myModel = {
         "studentName": "",
         "mobileNumber": "",
@@ -818,17 +818,29 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
 
                 $scope.masterSessionDetails = response.data.sessionDetails;
 
+                // service call for session master list in desc order based on date
+                angular.forEach($scope.masterSessionDetails,function (fvalue,fkey) {
+                    var parts = fvalue.SessionDate.split("-");
+                    fvalue.givenDateObject=new Date(parts[2], parts[1] - 1, parts[0]);
+                });
+                $scope.masterSessionDetails=dateListDescService.getOrderByList($scope.masterSessionDetails);
+                // end for service call
+
                 $scope.feesStructureInfo=response.data.feesDetails;
                 $scope.setModel = {
                     "feesType": $scope.feesStructureInfo[0],
                 };
                 angular.forEach($scope.feesStructureInfo[0].batchDetails,function (values,key) {
+                    var parts = values.BatchDate.split("-");
                     $scope.BatchDetails.push({
                         "BatchCode":values.BatchCode,
                         "BatchName":values.BatchName + '('+ values.BatchCode + ')',
-                        "BatchDate":values.BatchDate
+                        "BatchDate":values.BatchDate,
+                        "givenDateObject":new Date(parts[2], parts[1] - 1, parts[0])
                     })
                 });
+                // call service for make a list in desc order based on date
+                $scope.BatchDetails=dateListDescService.getOrderByList($scope.BatchDetails);
 
                 $scope.setTotalAmount=$scope.feesStructureInfo[0].PayableFees;
                 $rootScope.updateMoreItems=[];
@@ -910,7 +922,6 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
                             }
                         }
 
-
                     });
 
                     $scope.setModel.feesType.SessionName=$scope.feesStructureInfo[0].SessionName;
@@ -1056,12 +1067,17 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
             $scope.BatchDetails=[];
             $rootScope.updateMoreItems=[];
             angular.forEach(model.batchDetails,function (values,key) {
+                var parts1 = values.BatchDate.split("-");
                 $scope.BatchDetails.push({
                     "BatchCode":values.BatchCode,
                     "BatchName":values.BatchName + '('+ values.BatchCode + ')',
-                    "BatchDate":values.BatchDate
+                    "BatchDate":values.BatchDate,
-                })
+                    "givenDateObject":new Date(parts1[2], parts1[1] - 1, parts1[0])
+
+            })
             });
+            $scope.BatchDetails=dateListDescService.getOrderByList($scope.BatchDetails);
+
 
             if(model.InstallmentDetails != ''){
                 /*$scope.myModelInstallemt.ID=model.InstallmentDetails[model.InstallmentDetails.length-1].ID;

Apollo/assets/js/controllers/sendSMSsuperadminCtrl.js

@@ -1,6 +1,6 @@
 'use strict';
 /*** controller for Wizard Form example***/
-app.controller('sendSMSsuperadminCtrl', ["$scope", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', function ($scope, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie) {
+app.controller('sendSMSsuperadminCtrl', ["$scope", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', 'dateListDescService', function ($scope, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie, dateListDescService) {
 
     /**
     * Send SMS Functionality
@@ -73,6 +73,13 @@ app.controller('sendSMSsuperadminCtrl', ["$scope", "$filter", "ngTableParams", "
         $scope.searchData.Batch = '';
         $scope.courseData = name.Course;
         $scope.batchData = name.Batch;
+        //call service for array list in desc order based on date
+        angular.forEach($scope.batchData,function (values,key) {
+            var parts = values.BatchDate.split("-");
+            values.givenDateObject=new Date(parts[2], parts[1] - 1, parts[0]);
+        });
+        $scope.batchData=dateListDescService.getOrderByList($scope.batchData);
+        // end
         $scope.OpenWindowStatus = false;
         $scope.getSearch();
     };

Apollo/assets/js/controllers/sessionMasterCtrl.js

@@ -4,7 +4,7 @@
  * Simple table with sorting and filtering on AngularJS
  */
 
-app.controller('sessionMasterCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state", function ($scope,$rootScope,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state) {
+app.controller('sessionMasterCtrl', ["$scope","$rootScope","toaster", "$filter", "ngTableParams", "API_POINTS", "$localStorage", "$http", "$state" , "dateListDescService", function ($scope,$rootScope,toaster, $filter, ngTableParams, apiPoint, $localStorage, $http, $state, dateListDescService) {
     $scope.myModel = {
         "sessionName": "",
         "switchsetting": true
@@ -89,7 +89,7 @@ app.controller('sessionMasterCtrl', ["$scope","$rootScope","toaster", "$filter",
 
                 var addSession = {
                     method: 'POST',
-                    url: apiPoint.url + 'addSessionMaterDetails/',
+                    url: apiPoint.url + 'addSessionMasterDetails/',
                     headers: {
                         'Content-Type': 'application/json'
                     },
@@ -154,7 +154,7 @@ app.controller('sessionMasterCtrl', ["$scope","$rootScope","toaster", "$filter",
 
             var update = {
                 method: 'POST',
-                url: apiPoint.url + 'updateSessionMaterDetails/',
+                url: apiPoint.url + 'updateSessionMasterDetails/',
                 headers: {
                     'Content-Type': 'application/json'
                 },
@@ -197,7 +197,7 @@ app.controller('sessionMasterCtrl', ["$scope","$rootScope","toaster", "$filter",
         $scope.universityList = [];
         var getSession = {
             method: 'POST',
-            url: apiPoint.url + 'getSessionMaterDetails/',
+            url: apiPoint.url + 'getSessionMasterDetails/',
             headers: {
                 'Content-Type': 'application/json'
             },
@@ -213,19 +213,19 @@ app.controller('sessionMasterCtrl', ["$scope","$rootScope","toaster", "$filter",
 
                 $scope.emptyData=true;
                 $scope.loader=true;
-
                 $scope.data = response.data.details;
+              angular.forEach($scope.data,function (value,key) {
+                  var parts = value.SessionDate.split("-");
+                 // console.log(new Date(parts[2], parts[1] - 1, parts[0]));
+                  value.givenDateObject=new Date(parts[2], parts[1] - 1, parts[0]);
 
-               // $scope.university=response.data.universityDetails;
+              });
-
+              // call service for order by date in desc
-
+               $scope.data=dateListDescService.getOrderByList($scope.data);
-
 
             } else {
                 $scope.emptyData=false;
                 $scope.loader=true;
-               // $scope.university=response.data.universityDetails;
-
             }
             angular.forEach(response.data.universityDetails, function (values, keys) {
                 $scope.arrayData = {

Apollo/assets/js/controllers/studyMaterialStatusCtrl.js

@@ -1,7 +1,7 @@
 'use strict';
 /*** controller for Wizard Form example***/
-app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', '$window',
+app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', '$window', "dateListDescService",
-    function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie, $window) {
+    function ($scope, toaster, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie, $window, dateListDescService) {
 
         /**
         * Study material status update search 
@@ -106,6 +106,13 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
             $scope.searchData.Batch = '';
             $scope.courseData = name.Course;
             $scope.batchData = name.Batch;
+            //call service for array list in desc order based on date
+            angular.forEach($scope.batchData,function (values,key) {
+                var parts = values.BatchDate.split("-");
+                values.givenDateObject=new Date(parts[2], parts[1] - 1, parts[0]);
+            });
+            $scope.batchData=dateListDescService.getOrderByList($scope.batchData);
+            // end
             $scope.OpenWindowStatus = false;
             $scope.getSearch();
         };

Apollo/assets/js/directives/convert-words.js

@@ -169,4 +169,19 @@ app.filter('ucfirst', function() {
     return function(input) {
         return (!!input) ? input.charAt(0).toUpperCase() + input.substr(1).toLowerCase() : '';
     }
+});
+/*
+* service for session date
+* filter
+* */
+app.service('dateListDescService', function() {
+
+    this.getOrderByList = function(list) {
+       var listDetails = list.sort(function(a, b) {
+            a = new Date(a.givenDateObject);
+            b = new Date(b.givenDateObject);
+            return a >b ? -1 : a < b ? 1 : 0;
+        });
+        return listDetails;
+    }
 });

Apollo/assets/views/callTrackingFollowup.html

@@ -385,10 +385,8 @@
                                                         <div class="text-muted text-small">
                                                             {{message.FirstName}} &nbsp;&nbsp; On &nbsp;&nbsp;{{message.CreatedOn}}
                                                         </div>
+                                                            <span style="white-space:pre-wrap;margin-left: -4px;"> {{message.FollowupComments}}</span>
 
-                                                        <p>
-                                                            {{message.FollowupComments}}
-                                                        </p>
                                                     </div>
                                                 </li>
                                             </ul>

Apollo/assets/views/status-update/updateFeesStatus.html

@@ -537,7 +537,7 @@
                                                         </br>
                                                             <!--<span style="font-size: 16px;">(A Group of SVE Trust)</span>
                                                             </br>-->
-                                                            <span style="font-size: 16px;">{{BranchAddr}}</span>
+                                                            <span style="white-space:pre-wrap;font-size: 16px;">{{BranchAddr}}</span>
                                                         </td>
                                                     </tr>
                                                     <tr>