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

Apollo/api/application/config/constants.php

@@ -98,6 +98,11 @@ defined('CERTIFICATEUPDATE') OR define('CERTIFICATEUPDATE','C001');
 defined('APILICATIONUPDATE') OR define('APILICATIONUPDATE','A001');
 defined('BOOKLETUPDATE') OR define('BOOKLETUPDATE','B001');
 defined('MATERIALUPDATE') OR define('MATERIALUPDATE','M001');
+// define fees program types
+defined('SEMYEARFEES') OR define('SEMYEARFEES','Y001');
+defined('REGULARFEES') OR define('REGULARFEES','P001');
+defined('LATERALFEES') OR define('LATERALFEES','P002');
+
 //encript database table name
 defined('LOGIN') OR define('LOGIN','T_Login');
 defined('BRANCH') OR define('BRANCH','T_BranchMaster');
@@ -144,5 +149,5 @@ defined('STUDENTDOCUMENTTRACKDETAILS') OR define('STUDENTDOCUMENTTRACKDETAILS','
 //end of database table name 
 
 //encripted password  -> md5 
-defined('ENCR_PASSWORD') OR define('ENCR_PASSWORD','7594aacdb21d8a9b29f71ea9163a5730');
+defined('ENCR_PASSWORD') OR define('ENCR_PASSWORD','e99a18c428cb38d5f260853678922e03');
 //end of encripted password

Apollo/api/application/models/Fees_status_model.php

@@ -79,7 +79,6 @@ class Fees_status_model extends CI_Model
      * */
     public function getStudentFeesStructure($student=null){
 
-
         $this->db->select('CF.ID,CF.Sem_Year,CF.ProgramType,SFS.FeesID,SFS.CourseID,SFS.CourseFees,SFS.STFOrWR,SFS.Waiver,SFS.Others,SFS.RollNo,CU.PC,CU.TC,CU.DC,CU.MC,CU.OtherFees,SM.SessionName as SessionName,SM1.SessionName as ToSessionName');
         $this->db->from(STUDENTS_FEES_STATUS.' as SFS');
         $this->db->join(SESSIONMASTER.' as SM', 'SM.SessionID = SFS.SessionName');
@@ -395,8 +394,9 @@ class Fees_status_model extends CI_Model
      * created by kms
      * */
 
-    public function updateFees($feesPaidDetails=null)
+    public function updateFees($feesPaidDetails=null,$courseID=null)
     {
+
         if($feesPaidDetails['UpdatedBy']=='All'){
             $this->db->select('BranchID');
             $this->db->where('FeesID', $feesPaidDetails['FeesId']);
@@ -406,6 +406,10 @@ class Fees_status_model extends CI_Model
             $feesPaidDetails['UpdatedBy'] = $getStudentBranch[0]->BranchID;
 
         }
+
+       // $this->entryForAllStatus($feesPaidDetails,$courseID);
+       // die();
+
         $this->db->select('BillNO');
         $this->db->where('UpdatedBy', $feesPaidDetails['UpdatedBy']);
 
@@ -430,24 +434,40 @@ class Fees_status_model extends CI_Model
             $result['paidStatus'] = false;
             $result['message'] = "This bill number is already exist!";
         } else {
+
+            $this->db->select('ReceiptNo');
+            $this->db->where('ReceiptNo', $feesPaidDetails['ReceiptNo']);
+            if($this->db->get(STUDENTS_FEES_PAID)->first_row() AND $feesPaidDetails['ReceiptNo']!=''){
+                $result['paidStatus'] = false;
+                $result['message'] = "This receipt number is already exist!";
+            }
+            else{
                 $this->db->insert(STUDENTS_FEES_PAID, $feesPaidDetails);
                 if ($this->db->affected_rows() == '1') {
 
                     $result['paidStatus'] = true;
                     $result['message'] = "Successfully fees details added";
-                   $feesPayedID =  $this->db->insert_id();
+                    $feesPayedID =  $this->db->insert_id();
-                   // $entryOfCallTrack = $this->updateInCallTrack($trackDetails);
+                    // $entryOfCallTrack = $this->updateInCallTrack($trackDetails);
                     // day book entry
+
                     if($feesPaidDetails['BillAmount']!='0'){
+
                         $dayBookEntry = $this->insertDayBookMaster($feesPaidDetails,$feesPayedID);
                     }
 
+                    // Entry for all status screen except fees
+
+
 
                 }
                 else{
                     $result['paidStatus'] = false;
                     $result['message'] = "Something went wrong.please try again";
                 }
+            }
+
+
 
 
             }
@@ -881,8 +901,13 @@ class Fees_status_model extends CI_Model
         $this->db->where('SFS.StudentID',$student['StudentID']);
         $paidAmount = $this->db->get()->result();
 
-        if($feesAmount[0]->CourseFees+$feesAmount[0]->STFOrWR+$feesAmount[0]->Others-$feesAmount[0]->Waiver <= $paidAmount[0]->PaidAmount AND $feesAmount[0]->CourseFees !='0'){
+            if($feesAmount[0]->CourseFees+$feesAmount[0]->STFOrWR+$feesAmount[0]->Others-$feesAmount[0]->Waiver <= $paidAmount[0]->PaidAmount AND $feesAmount[0]->CourseFees !='0'){
-            // get default course fees
+                    $valid=1;
+            }
+            else{
+                $valid=0;
+            }
+            // get default course fees with paid
             $this->db->select('CourseID,CourseName,PC,TC,DC,MC,OtherFees');
             $this->db->where('CourseID',$student['CourseID']);
             $endFeesDetails = $this->db->get(COURSE);
@@ -911,6 +936,7 @@ class Fees_status_model extends CI_Model
                     $existFeesDetails = $this->db->get(STUDENTS_FEES_STATUS);
 
                     if($existData=$existFeesDetails->result()){
+                        $fetchData['Valid']=$valid;
                         $fetchData['ExistValue']=1;
                         $fetchData['ID']=$row1['Sem_Year'];
                         $fetchData['CourseID']=$row1['CourseID'];
@@ -943,6 +969,8 @@ class Fees_status_model extends CI_Model
                     }
                     else{
 
+                        $fetchData['Valid']=$valid;
+
                         $fetchData['ExistValue']=0;
 
                         $fetchData['ID']=$row1['Sem_Year'];
@@ -971,10 +999,10 @@ class Fees_status_model extends CI_Model
             else {
                 return false;
             }
-        }
+      /*  }
         else{
             return false;
-        }
+        }*/
 
 
 
@@ -1089,8 +1117,11 @@ class Fees_status_model extends CI_Model
      * created by kms
      * */
     public function insertDayBookMaster($data=null,$paymentID){
-        print_r($data);
+        $this->db->distinct();
-        die();
+        $this->db->select('Firstname');
+        $this->db->where('StudentID', $data['StudentID']);
+        $getStudentName=$this->db->get(STUDENTS)->result();
+        if($getStudentName){
             // this is for income entry
             $insertArray['Date'] = $data['BillDate'];
             $insertArray['CreatedBy'] = $data['CreatedBy'];
@@ -1100,7 +1131,8 @@ class Fees_status_model extends CI_Model
             $insertArray['Status'] = 'Approved';
             $insertArray['PaymentStatus'] = false;
             $insertArray['FeesPaymentID'] = $paymentID;
-            //$insertArray['Date'] = $data['BillDate'];
+            $insertArray['VoucherNumber'] = $data['BillNO'];
+            $insertArray['PaidTo'] = $getStudentName[0]->Firstname;
             $insertArray['BranchCode'] = $data['UpdatedBy'];
 
             $this->db->select('ID,TypeID');
@@ -1126,7 +1158,8 @@ class Fees_status_model extends CI_Model
             $expenseArray['Status'] = 'Approved';
             $expenseArray['PaymentStatus'] = false;
             $expenseArray['FeesPaymentID'] = $paymentID;
-
+            $expenseArray['VoucherNumber'] = $data['BillNO'];
+            $expenseArray['PaidTo'] = $getStudentName[0]->Firstname;
             $expenseArray['BranchCode'] = $data['UpdatedBy'];
 
             $this->db->select('ID,TypeID');
@@ -1141,6 +1174,12 @@ class Fees_status_model extends CI_Model
 
             }
             return true;
+        }
+        else{
+            return false;
+        }
+
+
 
 
 
@@ -1520,6 +1559,44 @@ class Fees_status_model extends CI_Model
         }
 
     }
+    /*
+     * Entry for all status update
+     * created by kms
+     * */
+    public function entryForAllStatus($feesDetails=null,$courseID=null){
+        $singleFeesDetails=["SEM1","SEM2","SEM3","SEM4","SEM5","SEM6","SEM7","SEM8"];
+        $this->db->select('SFS.FeesID');
+        $this->db->from(STUDENTS_FEES_PAID.' as SFP');
+        $this->db->join(STUDENTS_FEES_STATUS.' as SFS', 'SFS.FeesID = SFP.FeesId');
+        $this->db->where('SFS.CourseID',$courseID);
+        $this->db->where('SFS.StudentID',$feesDetails['StudentID']);
+        $existDetails = $this->db->get();
+        if($existDetails->result()){
+            return true;
+        }
+        else{
+            $this->db->select('ID,FeesType,ProgramType');
+            $this->db->where('CourseID',$courseID);
+            $getFeesTypeDetails = $this->db->get(COURSE_FEES);
+
+            if($getFeesTypeDetails->result()){
+                foreach ($getFeesTypeDetails->result() as $row){
+                   if($row->ProgramType==REGULARFEES OR $row->ProgramType==LATERALFEES){
+                       $insertDetails['StudentID']=$feesDetails['StudentID'];
+                       $insertDetails['CourseID']=$row->ID;
+                       $insertDetails['BranchCode']="";
+                       $insertDetails['ListCode']="";
+                       $insertDetails['StudentID']="";
+
+                   }
+
+                }
+
+            }
+
+        }
+
+    }
 
 
 }

Apollo/api/application/models/Login_model.php

@@ -17,7 +17,7 @@ class Login_model extends CI_Model
      * */
     
     /*
-     * Default login venba@123 -> 7594aacdb21d8a9b29f71ea9163a5730
+     * Default login abc123 -> e99a18c428cb38d5f260853678922e03
      */
     
     public function login($mobile = null, $password = null)

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

@@ -167,7 +167,7 @@
 
                                     <input type="text"  placeholder="Enter STF/WR Amount"
                                            autofocus tabindex="12" class="form-control" name="STF" id="STF" ng-maxlength="9"
-                                           ng-model="setModel.feesType.STFOrWR" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType,'2','2');" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"/>
+                                           ng-model="setModel.feesType.STFOrWR" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType,'2','2','2');" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"/>
                                     <span class="error text-small block"
                                           ng-if="Form.STF.$dirty && Form.STF.$invalid"
                                           ng-hide="Form.STF.$error.maxlength || Form.STF.$error.pattern">STF/WR amount is required</span>
@@ -183,7 +183,7 @@
 
                                     <input type="text"  placeholder="Enter Other Amount"
                                            autofocus tabindex="13" class="form-control" name="others" id="others" ng-maxlength="9"
-                                           ng-model="setModel.feesType.Others" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType,'2','1');" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" readonly/>
+                                           ng-model="setModel.feesType.Others" ng-pattern="/^[0-9]*$/" ng-change="setFeesTotalAmount(setModel.feesType,'2','1','2');" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" readonly/>
                                     <span class="error text-small block"
                                           ng-if="Form.others.$dirty && Form.others.$invalid"
                                           ng-hide="Form.others.$error.maxlength || Form.others.$error.pattern">Others amount is required</span>
@@ -207,7 +207,7 @@
                                           ng-if="Form.paid.$error.maxlength || Form.paid.$error.pattern">Enter a valid amount</span>
 
                                 </div>-->
-                                <div class="col-md-3 form-group" ng-if="setModel.feesType.ProgramType!='P001' && setModel.feesType.ProgramType!='P002'"
+                               <!-- <div class="col-md-3 form-group" ng-if="setModel.feesType.ProgramType!='P001' && setModel.feesType.ProgramType!='P002'"
                                      ng-class="{'has-error':Form.waiver.$dirty && Form.waiver.$invalid}">
                                     <label>
                                         Waiver</span>
@@ -222,11 +222,27 @@
                                     <span class="error text-small block"
                                           ng-if="Form.waiver.$error.maxlength || Form.waiver.$error.pattern">Enter a valid amount</span>
 
+                                </div>-->
+                                <div class="col-md-3 form-group" ng-if="setModel.feesType.ProgramType!='P001' && setModel.feesType.ProgramType!='P002'"
+                                     ng-class="{'has-error':Form.total.$dirty && Form.total.$invalid}">
+                                    <label>
+                                        Total Fees</span>
+                                    </label>
+
+                                    <input type="text"  placeholder="Enter Total Amount"
+                                           autofocus tabindex="15" class="form-control" name="total" id="total" ng-maxlength="9"
+                                           ng-model="setTotalAmount" ng-pattern="/^[0-9]*$/" readonly/>
+                                    <span class="error text-small block"
+                                          ng-if="Form.total.$dirty && Form.total.$invalid"
+                                          ng-hide="Form.total.$error.maxlength || Form.total.$error.pattern">Total amount is required</span>
+                                    <span class="error text-small block"
+                                          ng-if="Form.total.$error.maxlength || Form.total.$error.pattern">Enter a valid amount</span>
+
                                 </div>
 
                             </div>
                             <div class="row">
-                                <div class="col-md-3 form-group" ng-if="setModel.feesType.ProgramType=='P001' || setModel.feesType.ProgramType=='P002'"
+                                <!--<div class="col-md-3 form-group" ng-if="setModel.feesType.ProgramType=='P001' || setModel.feesType.ProgramType=='P002'"
                                      ng-class="{'has-error':Form.waiver.$dirty && Form.waiver.$invalid}">
                                     <label>
                                         Waiver</span>
@@ -241,8 +257,8 @@
                                     <span class="error text-small block"
                                           ng-if="Form.waiver.$error.maxlength || Form.waiver.$error.pattern">Enter a valid amount</span>
 
-                                </div>
+                                </div>-->
-                                <div class="col-md-3 form-group"
+                                <div class="col-md-3 form-group" ng-if="setModel.feesType.ProgramType=='P001' || setModel.feesType.ProgramType=='P002'"
                                      ng-class="{'has-error':Form.total.$dirty && Form.total.$invalid}">
                                     <label>
                                         Total Fees</span>
@@ -334,7 +350,7 @@
                                                                    placeholder="Select Date"
                                                                    min-date="getDateArray[$index].Date"
                                                                    max-date="getDateArray[$index+2].Date"
-                                                                   close-text="Close" ng-change="setFeesTotalAmount(setModel.feesType,'2','2');" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" ng-readonly="true"  required="required"/>
+                                                                   close-text="Close" ng-change="setFeesTotalAmount(setModel.feesType,'2','2','1');" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" ng-readonly="true"  required="required"/>
                                                             <span class="error text-small block"
                                                                   ng-if="n.DueDate==undefined">Date is required.</span>
                                                             <!--<span class="success text-small block"-->
@@ -351,70 +367,6 @@
 
 
                                                 </div>
-                                                <!--<div class="row">
-                                                    &lt;!&ndash;<div class="col-md-3 form-group"
-                                                         ng-class="{'has-error':Form.insName.$dirty && Form.insName.$invalid,'has-success':Form.insName.$valid}">
-                                                        <label>
-                                                            Installment <span
-                                                                class="symbol required"></span>
-                                                        </label>
-
-                                                        <input type="text"  placeholder="Enter Installment"
-                                                               tabindex="14" class="form-control" name="insName"
-                                                               ng-model="myModelInstallemt.name" ng-pattern="/^[a-zA-Z0-9-./\s]*$/" required ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"/>
-                                                        <span class="error text-small block"
-                                                              ng-if="Form.insName.$dirty && Form.insName.$error.required">Installment is required</span>
-                                                        <span class="error text-small block"
-                                                              ng-if="Form.insName.$dirty && Form.insName.$error.pattern">Enter a valid installment</span>
-                                                    </div>
-                                                    <div class="col-md-3 form-group"
-                                                         ng-class="{'has-error':Form.instfeesAmount.$dirty && Form.instfeesAmount.$invalid, 'has-success':Form.instfeesAmount.$valid}">
-                                                        <label>
-                                                            Amount <span
-                                                                class="symbol required"></span>
-                                                        </label>
-
-                                                        <input type="text"  placeholder="Enter Amount"
-                                                               autofocus tabindex="15" class="form-control" name="instfeesAmount" id="instfeesAmount" ng-maxlength="8"
-                                                               ng-model="myModelInstallemt.amount" ng-pattern="/^[0-9]*$/" required="" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"/>
-                                                        <span class="error text-small block"
-                                                              ng-if="Form.instfeesAmount.$dirty && Form.instfeesAmount.$invalid"
-                                                              ng-hide="Form.instfeesAmount.$error.maxlength || Form.instfeesAmount.$error.pattern">Amount is required</span>
-                                                        <span class="error text-small block"
-                                                              ng-if="Form.instfeesAmount.$error.maxlength || Form.instfeesAmount.$error.pattern">Enter a valid amount</span>
-
-                                                    </div>
-                                                    <div data-ng-controller="DatepickerDemoCtrl">
-                                                        <div class="col-md-3 form-group"
-                                                             ng-class="{'has-error':Form.date.$dirty && Form.date.$invalid, 'has-success':Form.date.$valid}">
-                                                            <label>
-                                                                Due Date <span
-                                                                    class="symbol required"></span>
-                                                            </label>
-                                                            <input type="text"
-                                                                   class="form-control " tabindex="16"
-                                                                   ng-click="startOpen = !startOpen"
-                                                                   datepicker-popup="dd-MM-yyyy"
-                                                                   ng-model="myModelInstallemt.date"
-                                                                   is-open="startOpen"
-                                                                   ng-init="startOpen = false"
-                                                                   name="date"
-                                                                   datepicker-options="dateOptions"
-                                                                   placeholder="Select Date"
-
-                                                                   max-date="futureDate"
-                                                                   close-text="Close" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" required="required"/>
-                                                            <span class="error text-small block"
-                                                                  ng-if="Form.date.$dirty && Form.date.$error.required">Date is required.</span>
-                                                            &lt;!&ndash;<span class="success text-small block"&ndash;&gt;
-                                                            &lt;!&ndash;ng-if="Form.date.$valid ">Thank You</span>&ndash;&gt;
-                                                        </div>
-
-                                                    </div>&ndash;&gt;
-                                                    <div class="col-md-3">
-                                                        <input type="button" class="btn btn-sm btn-info" title="Click to add one more items" value="Add More" ng-click="clickMoreItems(Form,setModel.feesType);" style="margin-top:16%;" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"/>
-                                                    </div>
-                                                </div>-->
 
 
                                             </div>
@@ -459,7 +411,7 @@
                                         <th>Course Fees</th>
                                         <th>STF/WR</th>
                                         <th>Others</th>
-                                        <th>Waiver</th>
+                                       <!-- <th>Waiver</th>-->
                                         <th>Payable Fees</th>
 
                                     </tr>
@@ -473,7 +425,7 @@
                                         <td>{{p.ActualFees}}</td>
                                         <td>{{p.STFOrWR}}</td>
                                         <td>{{p.Others}}</td>
-                                        <td>{{p.Waiver}}</td>
+                                       <!-- <td>{{p.Waiver}}</td>-->
                                         <td>{{p.PayableFees}}</td>
 
                                     </tr>

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

@@ -66,6 +66,9 @@
                                     <label ng-if="updateModel.feesType.ProgramType=='Y001'">
                                         Session <span class="symbol required"></span>
                                     </label>
+                                    <label ng-if="updateModel.feesType.ProgramType!='Y001' && updateModel.feesType.ProgramType!='P001' && updateModel.feesType.ProgramType!='P002'">
+                                        Session <!--<span class="symbol required"></span>-->
+                                    </label>
 
                                     <input type="text"  placeholder="Enter Session Name"
                                            tabindex="8" class="form-control" name="sessionname"
@@ -158,7 +161,7 @@
                                           ng-if="Form.others.$error.maxlength || Form.others.$error.pattern">Enter a valid amount</span>
 
                                 </div>
-                                <div class="col-md-3 form-group"
+                                <!--<div class="col-md-3 form-group"
                                      ng-class="{'has-error':Form.waiver.$dirty && Form.waiver.$invalid}">
                                     <label>
                                         Waiver</span>
@@ -173,7 +176,7 @@
                                     <span class="error text-small block"
                                           ng-if="Form.waiver.$error.maxlength || Form.waiver.$error.pattern">Enter a valid amount</span>
 
-                                </div>
+                                </div>-->
                                 <div class="col-md-3 form-group"
                                      ng-class="{'has-error':Form.total.$dirty && Form.total.$invalid}">
                                     <label>
@@ -425,7 +428,7 @@
                                         <th>Course Fees</th>
                                         <th>STF/WR</th>
                                         <th>Others</th>
-                                        <th>Waiver</th>
+                                      <!--  <th>Waiver</th>-->
                                         <th>Payable Fees</th>
                                         <th>Paid</th>
                                         <th>Balance</th>
@@ -446,7 +449,7 @@
                                         <td>{{p.CourseFees}}</td>
                                         <td>{{p.STFOrWR}}</td>
                                         <td>{{p.Others}}</td>
-                                        <td>{{p.Waiver}}</td>
+                                        <!--<td>{{p.Waiver}}</td>-->
                                         <td>{{p.PayableAmount}}</td>
                                         <td>{{p.PaidBillAmount}}</td>
                                         <td>{{p.BalanceAmount}}</td>

Apollo/assets/views/student/studentDetailsModal.html

@@ -13,6 +13,11 @@
         padding-bottom: 30px;
         border-bottom: 1px solid #eee;
     }
+   .ti-plus:before {
+       color: #006f95;
+   }
+
+
 </style>
 <!-- start: UI BOOTSTRAP MODALS -->
 <div class="container-fluid container-fullw bg-white">

Apollo/assets/views/student/studentView.html

@@ -212,21 +212,21 @@
                             </a>
                         </div>
                     </div>
-                        <div class="col-xs-5 text-center no-padding">
+                        <div class="col-xs-6 text-center no-padding">
                             <a class="text-blue">
                                 Course &nbsp;:&nbsp;{{course.CourseName}}
                             </a>
                         </div>
-                        <div class="col-xs-3 text-center no-padding">
+                        <div class="col-xs-6 text-center no-padding">
                             <a class="text-blue">
                                 Enrollment ID &nbsp;:&nbsp;{{course.EnrollmentID}}
                             </a>
                         </div>
-                        <div class="col-xs-4 text-center no-padding">
+                       <!-- <div class="col-xs-4 text-center no-padding">
                             <a class="text-blue">
                                 Session &nbsp;:&nbsp;{{course.SessionName}}
                             </a>
-                        </div>
+                        </div>-->
 
 
                     </div>