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

Apollo/api/application/models/Calltracking_model.php

@@ -588,6 +588,28 @@ class Calltracking_model extends CI_Model {
         
 
 //print_r($this->db->last_query());
+
+
+      $now = new DateTime();
+        $now->setTimezone(new DateTimezone('Asia/Kolkata'));
+
+       $todayDate=$now->format('Y-m-d');
+
+
+
+        $this->db->select('*');
+        $this->db->from('T_Lead_Details');
+        $this->db->where('DATE(CreatedOn)',$todayDate);
+         $numberDetails = $this->db->get();
+
+         $number=$numberDetails->result();
+
+          $total_number=count($number);
+
+      $result_array['TotalCallToday']=$total_number; 
+
+
+
         return $result_array;
 
     }

Apollo/api/application/models/DayBook_model.php

@@ -254,10 +254,7 @@ class DayBook_model extends CI_Model
             WHERE STR_TO_DATE(t1.Date, '%d-%m-%Y') BETWEEN '$fromDate' 
             AND '$toDate' AND t1.BranchCode = '$reqpayType' AND t1.Status NOT IN ('Approved', 'Cancel')
 
-             and t1.Type='$exptype' 
+             ";
-
-            AND (t1.ModeOfPayment='$ModeOfPayment' or t1.ModeOfPayment is NULL)
-             ORDER BY ORDER_ID DESC";
         } 
         else {   $reqpayType = $reqDataBy['localBranchID'];
             $querys = "SELECT t1.ID as ORDER_ID, t1.*, t2.ListName, t3.TypeName, t5.Firstname as Approved_by_name,t7.UniversityName as UniversityName, t6.CourseName as CourseName 
@@ -270,16 +267,48 @@ class DayBook_model extends CI_Model
             LEFT JOIN ".UNIVERSITY." as t7 ON t7.UniversityID = t6.UniversityID  AND t7.BranchCode = t1.BranchCode
             WHERE t1.BranchCode = '$reqpayType' AND t1.Status NOT IN ('Approved', 'Cancel')
 
-             and t1.Type='$exptype' 
+             ";
-             AND (t1.ModeOfPayment='$ModeOfPayment' or t1.ModeOfPayment is NULL) 
-             ORDER BY ORDER_ID DESC";
         }
+
+
+        if($exptype != '')
+        {
+            $querys.="and t1.Type='$exptype'";
+        }
+
+        if($ModeOfPayment !='')
+        {
+            $querys.= "AND (t1.ModeOfPayment='$ModeOfPayment' or t1.ModeOfPayment is NULL)";
+        }
+
+        $querys.="ORDER BY ORDER_ID DESC";
+
+
+        // $this->db->select('t1.ID as ORDER_ID, t1.*, t2.ListName, t3.TypeName, t5.Firstname as Approved_by_name,t7.UniversityName as UniversityName, t6.CourseName as CourseName');
+        // $this->db->from('T_DayBookMaster t1');
+        // $this->db->join('T_PickListDetails t2','t2.ListCode = t1.Name','left');
+        // $this->db->join('T_Income_Outcome_Master t3','t3.ID = t1.Type  AND t3.BranchCode = t1.BranchCode','left');
+        // $this->db->join('T_Login t4','t4 ON t4.ID = t1.Approval_By','left');
+        // $this->db->join('T_StaffDetails t5','t5.StaffID = t4.StaffID','left');
+        // $this->
+
+
+
+
+
+
+
+
+
+
+
+
             $dayBookDetails = $this->db->query($querys);
             $dayBookDetailsList = $dayBookDetails->result();
             $results['dayBookListStatus']      = true;
             $results['dayBookListDetails'] = $dayBookDetailsList;
-// print_r($this->db->last_query());
+ //print_r($this->db->last_query());
-// die();
+ // die();
         return $results;
     }
 

Apollo/api/application/models/Fees_status_model.php

@@ -1408,6 +1408,9 @@ $REGID='';
 
 
 // print_r($getlastid);
+
+
+  //      echo 'in';
 // die();
         $this->db->select('ListCode');
         $this->db->from('T_PickListDetails');
@@ -1427,16 +1430,16 @@ $REGID='';
         
 
 
-         // $fromd= date("d-m-Y",strtotime($details['CreatedOn']));
+         $fromd= date("d-m-Y",strtotime($details['CreatedOn']));
        
-         //  $upappform['BranchCode']=$details['BranchCode'];
+          $upappform['BranchCode']=$details['BranchCode'];
-         //  $upappform['AppFormDate']=$fromd; 
+          $upappform['AppFormDate']=$fromd; 
-         //  $upappform['Registration_Details_ID']=$REGID; 
+          $upappform['Registration_Details_ID']=$REGID; 
-         //  $upappform['ListCode']=$listcode; 
+          $upappform['ListCode']=$listcode; 
-         //  $upappform['CreatedBy']=$details['CreatedBy'];
+          $upappform['CreatedBy']=$details['CreatedBy'];
-         //  $upappform['CreatedOn']=$details['CreatedOn'];
+          $upappform['CreatedOn']=$details['CreatedOn'];
-         //  $upappform['Comments']='Fees for the student has been set';
+          $upappform['Comments']='Fees for the student has been set';
-         // $this->db->insert('T_ApplicationFormStatus', $upappform);
+         $this->db->insert('T_ApplicationFormStatus', $upappform);
 
 
 

Apollo/assets/js/controllers/callTrackingCtrl.js

@@ -427,6 +427,7 @@ if(checkresult != -1)
 
 
 
+$scope.trackingTodayno='';
 
     /*
    *get tracking list
@@ -434,6 +435,8 @@ if(checkresult != -1)
     * */
     $scope.init = function (myModel) {
 
+
+
        // console.log(myModel);
          var logcheck = JSON.parse(localStorage.getItem('localObj'));
 
@@ -472,6 +475,8 @@ if(checkresult != -1)
 
         $scope.loader = true;
 
+       
+
         var getTrackDetails = {
             method: 'POST',
             url: apiPoint.url + 'getTrackingDetails/',
@@ -490,7 +495,8 @@ if(checkresult != -1)
             if(response.data.pendingTrackingDetails.trackingStatus && response.data.trackingDetails.length > 0){
                 $scope.loader = false;
 
-
+                $scope.trackingTodayno=response.data.TotalCallToday;
+               // console.log($scope.trackingTodayno);
                // console.log(response.data)
                 //$scope.currentDate1=$filter('date')(new Date(), 'dd-MM-yyyy');
                 $scope.tillPendingDetails = response.data.pendingTrackingDetails.trackingDetails;
@@ -517,7 +523,7 @@ if(checkresult != -1)
                 });
 
 
-//console.log($scope.data);
+
                 $rootScope.trackingStatus = response.data.statusDetails;
 
                 localStorage.setItem('trackingList', JSON.stringify($scope.data));
@@ -571,12 +577,22 @@ if(checkresult != -1)
 
             }
 
-
+//sconsole.log($scope.data);
 
 
         });
 
+
+
+
+
     }
+
+
+
+
+
+
     // sorting function for table params
     $scope.sort = function(keyname){
         $scope.sortKey = keyname;   //set the sortKey to the param passed

Apollo/assets/js/controllers/daybookadminapprovalCtrl.js

@@ -127,7 +127,115 @@ app.controller('daybookadminapprovalCtrl', ["$scope", "$rootScope", "toaster", "
             } else {
             }
         });
+
+
+
+          var getExpenseType = {
+            method: 'POST',
+            url: apiPoint.url + 'getExpenseType/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                branch: localDetails.localBranchID,
+
+            }
+        };
+        $http(getExpenseType).then(function (response) {
+            
+             if(response.data.status='200')
+             {
+                $scope.ExpenseType= response.data.details;
+             }
+
+             else
+             {
+
+             }
+        
+        });
+
+
+
     }
+
+
+
+
+
+
+
+    $scope.searchData = {
+        "modeofpayment": "",
+        "exptype": ""
+    }
+
+
+    $scope.getfilterDetails=function(p)
+    {
+        // alert()
+     //console.log(p)
+    // return false;
+        // console.log(p.paymentOn.paymentOn)
+
+        if((p.expensetype != undefined)||(p.paymentOn != undefined))
+         {   
+
+            var getDayBookfilterDetails = {
+            method: 'POST',
+            url: apiPoint.url + 'getDayBookfilterDetails/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                data: $scope.searchData,
+                localReqDetails: localDetails,
+                exptype:p.expensetype,
+                modeofpayment:p.paymentOn,
+                fdate:$scope.searchData.date,
+                tdate:$scope.searchData.dateTo
+            }
+        };
+        $http(getDayBookfilterDetails).then(function (response) {
+            if (response.data.dayBookListStatus) {
+                $scope.loadingsearch = false;
+               
+                $scope.searchResultDetails = response.data.dayBookListDetails;
+                $scope.searchResultDetailsCopy = response.data.dayBookListDetails;
+            } else {
+                $scope.loadingsearch = false;
+            }
+        });
+
+       }
+
+       else
+       {
+           $scope.getDayBookList();
+       }
+
+
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
     $scope.loadingsearch = false;
     $scope.noRecordFound = true;

Apollo/assets/js/controllers/daybookapprovalCtrl.js

@@ -126,8 +126,109 @@ app.controller('daybookapprovalCtrl', ["$scope", "$rootScope", "toaster", "$filt
             } else {
             }
         });
+
+
+
+
+        var getExpenseType = {
+            method: 'POST',
+            url: apiPoint.url + 'getExpenseType/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                branch: localDetails.localBranchID,
+
+            }
+        };
+        $http(getExpenseType).then(function (response) {
+            
+             if(response.data.status='200')
+             {
+                $scope.ExpenseType= response.data.details;
+             }
+
+             else
+             {
+
+             }
+        
+        });
+
+
     }
 
+
+
+
+
+
+    $scope.searchData = {
+        "modeofpayment": "",
+        "exptype": ""
+    }
+
+
+    $scope.getfilterDetails=function(p)
+    {
+        // alert()
+    // console.log(p)
+    // return false;
+        // console.log(p.paymentOn.paymentOn)
+
+        if((p.expensetype != undefined)||(p.paymentOn != undefined))
+         {   
+
+            var getDayBookfilterDetails = {
+            method: 'POST',
+            url: apiPoint.url + 'getDayBookfilterDetails/',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            data: {
+                data: $scope.searchData,
+                localReqDetails: localDetails,
+                exptype:p.expensetype,
+                modeofpayment:p.paymentOn,
+                fdate:$scope.searchData.date,
+                tdate:$scope.searchData.dateTo
+            }
+        };
+        $http(getDayBookfilterDetails).then(function (response) {
+            if (response.data.dayBookListStatus) {
+                $scope.loadingsearch = false;
+               
+                $scope.searchResultDetails = response.data.dayBookListDetails;
+                $scope.searchResultDetailsCopy = response.data.dayBookListDetails;
+            } else {
+                $scope.loadingsearch = false;
+            }
+        });
+
+       }
+
+       else
+       {
+           $scope.getDayBookList();
+       }
+
+
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+    
+
     $scope.loadingsearch = false;
     $scope.noRecordFound = true;
     $scope.noRecordFoundSearch = false;

Apollo/assets/js/controllers/daybooksuperadminapprovalCtrl.js

@@ -237,10 +237,11 @@ app.controller('daybooksuperadminapprovalCtrl', ["$scope", "$rootScope", "toaste
     $scope.getfilterDetails=function(p)
     {
         // alert()
-     //console.log(p.expensetype)
+    // console.log(p)
+    // return false;
         // console.log(p.paymentOn.paymentOn)
 
-        if((p.expensetype != undefined)&&(p.paymentOn.paymentOn != undefined))
+        if((p.expensetype != undefined)||(p.paymentOn != undefined))
          {   
 
             var getDayBookfilterDetails = {
@@ -253,7 +254,7 @@ app.controller('daybooksuperadminapprovalCtrl', ["$scope", "$rootScope", "toaste
                 data: $scope.searchData,
                 localReqDetails: localDetails,
                 exptype:p.expensetype,
-                modeofpayment:p.paymentOn.paymentOn,
+                modeofpayment:p.paymentOn,
                 fdate:$scope.searchData.date,
                 tdate:$scope.searchData.dateTo
             }

Apollo/assets/js/controllers/report_app_pendingCtrl.js

@@ -177,6 +177,7 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
  /**
      * Auto Call Tracking Sriram
      */
+	 $rootScope.selectedStudentMN = [];
     $scope.selectedStudentsID = [];
     $scope.isCheckAll = function(e){
         var val = (e.target.checked ? true : false);
@@ -210,11 +211,13 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
         var ide = e.target;
     var val = (ide.checked ? true : false);
     var sid = e.target.id;
+	var smn = e.target.Phone_number;
     angular.forEach($scope.app_pending_data,function(value,key){
         //console.log(value);
         if(sid == value.Student_id)
         {
             sid = value;
+			smn = value.Phone_number;
         }
     });
     
@@ -227,6 +230,7 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
            
             //console.log("PUSH");
             $scope.selectedStudentsID.push(sid);
+			$rootScope.selectedStudentMN.push(smn);
         }
         
     }
@@ -235,6 +239,7 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
        
         //console.log("POP");
         $scope.selectedStudentsID.splice(pos,1);
+		$rootScope.selectedStudentMN.splice(pos,1);
     }
     //
     if(val){
@@ -244,6 +249,21 @@ app.controller('report_app_pendingCtrl', ["$scope", "$filter","$rootScope","$mod
     }
     //console.log($scope.selectedStudentsID);
     }
+	$scope.sendingsms = function(){
+        
+		
+        //$rootScope.student = $scope.selectedStudentsID;
+        if($scope.selectedStudentMN ==''){
+            swal('Select Check box','','warning');
+			return false;
+        }
+		else{
+		
+		  $state.go('app.broadCast.sendSMSPage');
+            
+    
+        }
+    }	
     $scope.calltracking = function(){
         
         //$rootScope.student = $scope.selectedStudentsID;

Apollo/assets/js/controllers/report_balfeeCtrl.js

@@ -227,6 +227,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
 /**
      * Auto Call Tracking Sriram
      */
+	 $rootScope.selectedStudentbalfeesMN = [];
     $scope.selectedStudentsID = [];
     $scope.isCheckAll = function(e){
         var val = (e.target.checked ? true : false);
@@ -260,6 +261,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
         var ide = e.target;
     var val = (ide.checked ? true : false);
     var sid = e.target.id;
+	var smn = e.target.Phone_number;
     // console.log("328");
     // console.log($scope.balfee_data);
     angular.forEach($scope.balfee_data,function(value,key){
@@ -267,6 +269,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
         if(sid == value.Student_id && s == value.Sem_year)
         {
             sid = value;
+			smn = value.Phone_number;
         }
     });
         console.log(sid);
@@ -280,6 +283,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
            
             //console.log("PUSH");
             $scope.selectedStudentsID.push(sid);
+			$rootScope.selectedStudentbalfeesMN.push(smn);
         }
         
     }
@@ -288,6 +292,7 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
        
         //console.log("POP");
         $scope.selectedStudentsID.splice(pos,1);
+		$rootScope.selectedStudentbalfeesMN.splice(smn);
     }
     //
     if(val){
@@ -297,6 +302,21 @@ app.controller('report_balfeeCtrl', ["$scope", "$filter","$rootScope","$modal",
     }
     //console.log($scope.selectedStudentsID);
     }
+	$scope.sendingsms = function(){
+        
+		
+        //$rootScope.student = $scope.selectedStudentsID;
+        if($scope.selectedStudentbalfeesMN ==''){
+            swal('Select Check box','','warning');
+			return false;
+        }
+		else{
+		
+		  $state.go('app.broadCast.sendSMSPage');
+            
+    
+        }
+    }	
     $scope.calltracking = function(){
         
         //$rootScope.student = $scope.selectedStudentsID;

Apollo/assets/js/controllers/report_certificateCtrl.js

@@ -173,6 +173,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod
     /**
      * Auto Call Tracking Sriram
      */
+	 $rootScope.selectedStudentcertificateMN = [];
     $scope.selectedStudentsID = [];
     $scope.isCheckAll = function(e){
         var val = (e.target.checked ? true : false);
@@ -206,6 +207,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod
         var ide = e.target;
     var val = (ide.checked ? true : false);
     var sid = e.target.id;
+	var smn = e.target.Phone_number;
     // console.log("328");
     // console.log($scope.balfee_data);
     angular.forEach($scope.cert_data,function(value,key){
@@ -213,6 +215,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod
         if(sid == value.Student_id)
         {
             sid = value;
+			smn = value.Phone_number;
         }
     });
         console.log(sid);
@@ -226,6 +229,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod
            
             //console.log("PUSH");
             $scope.selectedStudentsID.push(sid);
+			$rootScope.selectedStudentcertificateMN.push(smn);
         }
         
     }
@@ -234,6 +238,7 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod
        
         //console.log("POP");
         $scope.selectedStudentsID.splice(pos,1);
+		$rootScope.selectedStudentcertificateMN.splice(pos,1);
     }
     //
     if(val){
@@ -243,6 +248,21 @@ app.controller('report_certificateCtrl', ["$scope", "$filter","$rootScope","$mod
     }
     //console.log($scope.selectedStudentsID);
     }
+	$scope.sendingsms = function(){
+        
+		
+        //$rootScope.student = $scope.selectedStudentsID;
+        if($scope.selectedStudentcertificateMN ==''){
+            swal('Select Check box','','warning');
+			return false;
+        }
+		else{
+		
+		  $state.go('app.broadCast.sendSMSPage');
+            
+    
+        }
+    }	 
     $scope.calltracking = function(){
         
         //$rootScope.student = $scope.selectedStudentsID;

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', 'dateListDescService', function ($scope, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie, dateListDescService) {
+app.controller('sendSMSsuperadminCtrl', ["$scope","$rootScope", "$filter", "ngTableParams", "API_POINTS", "$http", "SweetAlert", "$state", 'md5', 'ipCookie', 'dateListDescService', function ($scope,$rootScope, $filter, ngTableParams, apiPoint, $http, SweetAlert, $state, md5, ipCookie, dateListDescService) {
 
     /**
     * Send SMS Functionality
@@ -10,6 +10,40 @@ app.controller('sendSMSsuperadminCtrl', ["$scope", "$filter", "ngTableParams", "
     var localDetails = ipCookie('cookiechk');
 
     $scope.init = function () {
+		$scope.mobilenumbers=$rootScope.selectedStudentMN;
+		$scope.certificatemobilenumbers=$rootScope.selectedStudentcertificateMN;
+		$scope.balfeesmobilenumbers=$rootScope.selectedStudentbalfeesMN;
+		
+		if($scope.mobilenumbers != undefined)
+		{
+			 //tabtwo: true
+			 $scope.tabone = false;
+             $scope.tabtwo = true;
+             $scope.tabthree = false;
+			 $scope.radio=1;
+			 $scope.listMobileNums=$scope.mobilenumbers;
+			 
+		}
+	    if($scope.certificatemobilenumbers != undefined)
+		{
+			 //tabtwo: true
+			 $scope.tabone = false;
+             $scope.tabtwo = true;
+             $scope.tabthree = false;
+			 $scope.radio=1;
+			 $scope.listMobileNums=$scope.certificatemobilenumbers;
+			 
+		}
+		if($scope.balfeesmobilenumbers != undefined)
+		{
+			 //tabtwo: true
+			 $scope.tabone = false;
+             $scope.tabtwo = true;
+             $scope.tabthree = false;
+			 $scope.radio=1;
+			 $scope.listMobileNums=$scope.balfeesmobilenumbers;
+			 
+		}
 
        
        var logcheck = JSON.parse(localStorage.getItem('localObj'));

Apollo/assets/views/callTrackingDetails.html

@@ -126,6 +126,22 @@
                                         </div>
                                     </div>
                                 </div>
+
+
+                        
+
+                                <div data-ng-init="getTodaycalls()">
+                                    <div style="margin: 8px;">
+                                        <div style="width: 45px; display: initial;">
+                                            <span style="font-size: 14px;
+    color: black;">Today's Count:</span> <span class="listCoutShow"> {{ trackingTodayno }}</span>
+                                        </div>
+                                    </div>
+                                </div>
+
+
+
+
                             </div>
 
 

Apollo/assets/views/daybook/dayBookApproval.html

@@ -86,6 +86,82 @@
                                         </div> -->
                                         
                                     </div>
+
+
+
+
+
+
+
+<div class="row">
+
+
+        <div class="col-md-3">
+
+                <label>
+                    Mode Of Payment <span class="symbol required"></span>
+                </label>
+                <select class="form-control" name="paymentOn" tabindex="20" id="paymentOn"
+                    ng-model="updateModel.paymentOn"
+                    required>
+                    <option value=""> Select Payment</option>
+                    <option value="CASH"> CASH</option>
+                    <option value="CHEQUE"> CHEQUE</option>
+                    <option value="REFERRAL"> REFERRAL</option>
+                    <option value="ONLINE TRANSACTION"> ONLINE TRANSACTIONWAIVER</option>
+                    <option value="WAIVER"> WAIVER</option>
+                    <option value="Credit/Debit Card"> Credit/Debit Card</option>
+
+                </select>
+        </div>
+
+        <div class="col-md-3">
+
+                <label>
+                    Expense Type <span class="symbol required"></span>
+                </label>
+                <select class="form-control" name="paymentOn" tabindex="20" id="expensetype"
+                    ng-model="updateModel.expensetype"
+                    required>
+                    <option value=""> Select</option>
+
+                    <option  ng-repeat="exp in ExpenseType" value="{{exp.ID}}">{{exp.TypeName}}</option>
+                </select>
+        </div>
+
+
+        <div class="col-md-3">
+
+        <br/>
+
+            <button type="submit" class="btn btn-success btn-o" ng-click="getfilterDetails(updateModel);" tabindex="8">
+                    Submit
+            </button>
+
+        </div>
+
+
+</div>
+
+<div>
+<br/>
+</div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                                     <div>
                                         <div ng-show="loadingsearch" class="center">
                                             <span style="color: #007AFF;

Apollo/assets/views/daybook/dayBookadminApproval.html

@@ -91,6 +91,77 @@
 
                                         </div> -->
                                     </div>
+
+
+
+
+<div class="row">
+
+
+        <div class="col-md-3">
+
+                <label>
+                    Mode Of Payment <span class="symbol required"></span>
+                </label>
+                <select class="form-control" name="paymentOn" tabindex="20" id="paymentOn"
+                    ng-model="updateModel.paymentOn"
+                    required>
+                    <option value=""> Select Payment</option>
+                    <option value="CASH"> CASH</option>
+                    <option value="CHEQUE"> CHEQUE</option>
+                    <option value="REFERRAL"> REFERRAL</option>
+                    <option value="ONLINE TRANSACTION"> ONLINE TRANSACTIONWAIVER</option>
+                    <option value="WAIVER"> WAIVER</option>
+                    <option value="Credit/Debit Card"> Credit/Debit Card</option>
+
+                </select>
+        </div>
+
+        <div class="col-md-3">
+
+                <label>
+                    Expense Type <span class="symbol required"></span>
+                </label>
+                <select class="form-control" name="paymentOn" tabindex="20" id="expensetype"
+                    ng-model="updateModel.expensetype"
+                    required>
+                    <option value=""> Select</option>
+
+                    <option  ng-repeat="exp in ExpenseType" value="{{exp.ID}}">{{exp.TypeName}}</option>
+                </select>
+        </div>
+
+
+        <div class="col-md-3">
+
+        <br/>
+
+            <button type="submit" class="btn btn-success btn-o" ng-click="getfilterDetails(updateModel);" tabindex="8">
+                    Submit
+            </button>
+
+        </div>
+
+
+</div>
+
+<div>
+<br/>
+</div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                                     <div>
                                         <div ng-show="loadingsearch" class="center">
                                             <span style="color: #007AFF;

Apollo/assets/views/daybook/daybooksuperAdminApproval.html

@@ -79,10 +79,14 @@
                 </label>
                 <select class="form-control" name="paymentOn" tabindex="20" id="paymentOn"
                     ng-model="updateModel.paymentOn"
-                    ng-options="payment.paymentOn for payment in paymentOptions"
                     required>
                     <option value=""> Select Payment</option>
-                    <option  ng-repeat="pay in paymentOptions" value="{{pay.paymentOn}}">{{pay.paymentOn}}</option>
+                    <option value="CASH"> CASH</option>
+                    <option value="CHEQUE"> CHEQUE</option>
+                    <option value="REFERRAL"> REFERRAL</option>
+                    <option value="ONLINE TRANSACTION"> ONLINE TRANSACTIONWAIVER</option>
+                    <option value="WAIVER"> WAIVER</option>
+                    <option value="Credit/Debit Card"> Credit/Debit Card</option>
 
                 </select>
         </div>

Apollo/assets/views/report_application_pending.html

@@ -79,15 +79,17 @@
 
         </form>
         <!-- <pre>{{statusr | json}}</pre> -->
-        <div class="row" style="text-align: right;">
+         <div class="row" style="text-align: right;">
-                <div class="col-md-4">
+                <div class="col-md-6">
                 <input class="form-control"  type="text" ng-model="search" id="searchIn" autofocus tabindex="2" placeholder="Search" />
                 </div>
-                <div class="col-md-6">
+                <div class="col-md-6" style="align:right">
+				<button class="btn btn-success btn-o" ng-click="sendingsms()">Send SMS</button>
                         <button class="btn btn-success btn-o" ng-click="calltracking()">Call Tracking</button>
-                            </div>
+						
+                           
                 <button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
-            
+             </div>
         </div>
         <div class="table-responsive" style="margin-top: 20px;">
             <table  id="datatable"   class="table table-striped table-bordered table-hover table-condensed" style="font-size:0.9em;" ng-controller="studentModalDemoCtrl">

Apollo/assets/views/report_balance_fee.html

@@ -72,25 +72,24 @@
     
             </form>
             <!-- <pre>{{statusr | json}}</pre> -->
-            <div class="row" style="text-align: right;">
+             <div class="row" style="text-align: right;">
                     <div class="col-md-2">
                     <input class="form-control"  type="text" ng-model="search" id="searchIn" autofocus tabindex="2" placeholder="Search" />
                     </div>
-					<div class="col-md-2">
+					<div class="col-md-4">
                     <span>Total Fee:Rs.</span><span>{{gettotal() || "0"}}</span>
-                    </div>
+                   
-					<div class="col-md-2">
                     <span>Paid:Rs.</span><span>{{getpaid() || "0"}}</span>
-                    </div>
+                   
-			
-					<div class="col-md-2">
 					<span>Balance:Rs.</span><span>{{getbalance() || "0"}}</span>
                     <span>({{getbalance()/gettotal()*100 | number : 2 || "0"}}%)</span>
                     </div>
-                    <div class="col-md-2">
+					 <div class="col-md-6">
+					<button class="btn btn-success btn-o" ng-click="sendingsms()">Send SMS</button>
+					
+                    
                             <button class="btn btn-success btn-o" ng-click="calltracking()">Call Tracking</button>
-                      </div>
+                     		
-					 <div class="col-md-2">			
                     <button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
                    </div>
             </div>

Apollo/assets/views/report_certificate_status.html

@@ -121,10 +121,12 @@ td,th {
                 <div class="col-md-4">
                 <input class="form-control"  type="text" ng-model="search" id="searchIn" autofocus tabindex="2" placeholder="Search" />
                 </div>
-                <div class="col-md-6">
+                <div class="col-md-8">
+				<button class="btn btn-success btn-o" ng-click="sendingsms()">Send SMS</button>
                         <button class="btn btn-success btn-o" ng-click="calltracking()">Call Tracking</button>
+						<button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
                             </div>
-                <button class="btn btn-success btn-o" ng-click="exportData()">Export to Excel</button>
+                
             
         </div>
         <div class="table-responsive" style="margin-top: 20px;">

Apollo/assets/views/sendSMS/sendSMSsuperadmin.html

@@ -16,7 +16,7 @@
             <div ng-controller="sendSMSsuperadminCtrl" ng-init="init()">
                 <!--<h1>D</h1>-->
                 <tabset class="tabbable">
-                    <tab heading="Send Student Messages" id="viewDayBook">
+                    <tab heading="Send Student Messages"  active="tabone" >
                         <div class="row">
                             <!--<div class="col-md-3">
                         <label for="form-field-select-2">
@@ -241,7 +241,7 @@
                             <!--studen search result end-->
                         </div>
                     </tab>
-                    <tab heading="Send Promotional Messages">
+                    <tab heading="Send Promotional Messages" active ="tabtwo" >
                         <style>
                             .mobileNumberList {
                                 margin: 6px;
@@ -385,7 +385,7 @@
                             </div>
                         </form>
                     </tab>
-                    <tab heading="Manage Groups">
+                    <tab heading="Manage Groups" active ="tabthree">
 
 
                         <form name="Form" id="Form" novalidate ng-submit="AddGroup.submit(Form,myModel)" method="post">

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

@@ -286,6 +286,7 @@
                                                             <input type="text" tabindex="6" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myStatusModel.dateOn"
                                                                 is-open="startOpen" ng-init="startOpen = false" name="dateofstaus"
                                                                 datepicker-options="dateOptions" placeholder="Select Date " close-text="Close"
+                                                                max-date="minDate"
                                                                 required="required" ng-change="getMaxEndDate(myModel.startDate)"
                                                             />
 
@@ -482,6 +483,7 @@
                                                             <input type="text" tabindex="6" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myStatusModel.dateOn"
                                                                 is-open="startOpen" ng-init="startOpen = false" name="dateofstaus"
                                                                 datepicker-options="dateOptions" placeholder="Select Date " close-text="Close"
+                                                                max-date="minDate"
                                                                 required="required" ng-change="getMaxEndDate(myModel.startDate)"
                                                             />