Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
resicovenba 2018-02-24 12:54:11 +05:30
commit a938278935
12 changed files with 93 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Apollo/api/application/models/Studentview_model.php
View File

@ -123,7 +123,7 @@ class Studentview_model extends CI_Model
* */
public function getStudentFeesDetails($studentID=null,$courseID=null){
$this->db->distinct();
$this->db->select('SFS.FeesID,SFS.FeesType,SFS.SessionName,SFS.RollNo,ifnull(SFS.CourseFees,0) as CourseFees,ifnull(SFS.STFOrWR,0) as STFOrWR,ifnull(SFS.Waiver,0) as Waiver,ifnull(SFS.Others,0) as Others,CF.Sem_Year');
$this->db->select('SFS.FeesID,SFS.FeesType,SFS.SessionName,SFS.RollNo,ifnull(SFS.CourseFees,0) as CourseFees,ifnull(SFS.STFOrWR,0) as STFOrWR,ifnull(SFS.Waiver,0) as Waiver,ifnull(SFS.Others,0) as Others,CF.Sem_Year,CF.FeesType as CourseFeesType');
$this->db->from(STUDENTS_FEES_STATUS.' as SFS');
$this->db->join(STUDENTS_FEES_PAID.' as SFP','SFP.FeesId = SFS.FeesID','left');
$this->db->join(COURSE_FEES.' as CF', 'CF.ID = SFS.FeesType');
@ -141,6 +141,7 @@ class Studentview_model extends CI_Model
$storePaidDetails['STFOrWR'] = $feeRow->STFOrWR;
$storePaidDetails['Waiver'] = $feeRow->Waiver;
$storePaidDetails['Others'] = $feeRow->Others;
$storePaidDetails['CourseFeesType'] = $feeRow->CourseFeesType;
$storePaidDetails['PayableAmount'] = $feeRow->CourseFees+$feeRow->STFOrWR+$feeRow->Others-$feeRow->Waiver;
$this->db->select('ifnull(SUM((BillAmount)),0) as PaidBillAmount');
@ -242,7 +243,7 @@ class Studentview_model extends CI_Model
* created by kms
* */
public function getStudentMaterialDetails($studentID=null,$courseID=null){
$this->db->select('SMS.CourseID,SMS.SDate,SMS.Comments,CF.Sem_Year,PLD.ListName');
$this->db->select('SMS.CourseID,SMS.SDate,SMS.Comments,SMS.Sem,CF.Sem_Year,CF.FeesType,PLD.ListName');
$this->db->from(STUDY_MATERIAL_STATUS.' as SMS');
$this->db->join(COURSE_FEES.' as CF','CF.ID = SMS.CourseID');
$this->db->join(COURSE.' as CU', 'CU.CourseID = CF.CourseID');
@ -289,7 +290,7 @@ class Studentview_model extends CI_Model
* */
public function getMarkcardDetails($studentID=null,$courseID=null){
$this->db->select('CS.CourseID,CS.CertificationNo,CS.CDate,CS.Comments,CS.CertificationType as CertificateName,CF.Sem_Year,PLD.ListName');
$this->db->select('CS.CourseID,CS.CertificationNo,CS.CDate,CS.Comments,CS.CertificationType as CertificateName,CF.Sem_Year,CF.FeesType,CS.Sem,PLD.ListName');
$this->db->from(CERTIFICATION_STATUS.' as CS');
$this->db->join(COURSE_FEES.' as CF','CF.ID = CS.CourseID');
$this->db->join(COURSE.' as CU', 'CU.CourseID = CF.CourseID');

2
Apollo/assets/views/batch.html
View File

@ -161,7 +161,7 @@
name="date"
datepicker-options="dateOptions"
placeholder="Select Date"
close-text="Close" ng-change="getDateFormat(myModel.date,'1');" required="required"/>
close-text="Close" ng-change="getDateFormat(myModel.date,'1');" required="required" ng-readonly="true"/>
<span class="error text-small block"
ng-if="Form.date.$dirty && Form.date.$error.required">Batch date is required.</span>
<!--<span class="success text-small block"-->

2
Apollo/assets/views/callTrackingCloseDetails.html
View File

@ -50,7 +50,7 @@
datepicker-options="dateOptions"
placeholder="Select Date"
max-date="maxDate"
close-text="Close" ng-change="checkDate(myModel)"/>
close-text="Close" ng-change="checkDate(myModel)" ng-readonly="true"/>
<input class="form-control" type="text" ng-model="myModel.search" id="search" autofocus placeholder="Search Date" ng-hide="hideDateSearch==true" />
</div>

6
Apollo/assets/views/callTrackingDetails.html
View File

@ -68,7 +68,7 @@
datepicker-options="dateOptions"
placeholder="Select From Date"
max-date="minStartDate"
max-date="minStartDate" ng-readonly="true"
close-text="Close" ng-change="checkDate(myModel,'2');">
@ -81,7 +81,7 @@
<input type="text" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModel.dateTo"
is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
min-date="toMinDate"
placeholder="Select To Date" close-text="Close" required="required" ng-change="checkToDate(myModel);"
placeholder="Select To Date" close-text="Close" required="required" ng-change="checkToDate(myModel);" ng-readonly="true"
show-button-bar="true" />
</div>
@ -347,7 +347,7 @@
placeholder="Select Date"
min-date="minDate"
max-date="futureDate"
close-text="Close" required="required"/>
close-text="Close" required="required" ng-readonly="true"/>
<span class="error text-small block"
ng-if="Form.date.$dirty && Form.date.$error.required">Followup Date is required.</span>
<!--<span class="success text-small block"-->

2
Apollo/assets/views/callTrackingFollowup.html
View File

@ -140,7 +140,7 @@
placeholder="Select Date"
min-date="currentDate1"
max-date="futureDate1"
close-text="Close" required="required"/>
close-text="Close" required="required" ng-readonly="true"/>
<span class="error text-small block"
ng-if="Form.date.$dirty && Form.date.$error.required">Date is required.</span>
<!--<span class="success text-small block"-->

2
Apollo/assets/views/callTrackingLeadDetails.html
View File

@ -51,7 +51,7 @@
datepicker-options="dateOptions"
placeholder="Select Date"
max-date="maxDate"
close-text="Close" ng-change="checkDate(myModel)"/>
close-text="Close" ng-change="checkDate(myModel)" ng-readonly="true"/>
<input class="form-control" type="text" ng-model="myModel.search" id="search" autofocus placeholder="Search Date" ng-hide="hideDateSearch==true" />
</div>

2
Apollo/assets/views/callTrackingPendingDetails.html
View File

@ -51,7 +51,7 @@
datepicker-options="dateOptions"
placeholder="Select Date"
max-date="maxDate"
close-text="Close" ng-change="checkDate(myModel)"/>
close-text="Close" ng-change="checkDate(myModel)" ng-readonly="true"/>
<input class="form-control" type="text" ng-model="myModel.search" id="search" autofocus placeholder="Search Date" ng-hide="hideDateSearch==true" />
</div>

2
Apollo/assets/views/editBatchDetails.html
View File

@ -40,7 +40,7 @@
name="date"
datepicker-options="dateOptions"
placeholder="Select Date"
close-text="Close" ng-change="getDateFormat(p.BatchDate,'2');" required="required"/>
close-text="Close" ng-change="getDateFormat(p.BatchDate,'2');" required="required" ng-readonly="true"/>
<span class="error text-small block"
ng-if="Form.date.$dirty && Form.date.$error.required">Batch date is required.</span>
<!--<span class="success text-small block"-->

3
Apollo/assets/views/status-update/setFeesForStudent.html
View File

@ -267,11 +267,10 @@
is-open="startOpen"
ng-init="startOpen = false"
name="date{{$index}}"
datepicker-options="dateOptions"
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'" required="required"/>
close-text="Close" ng-change="setFeesTotalAmount(setModel.feesType,'2','2');" 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"-->

2
Apollo/assets/views/status-update/updateFeesStatus.html
View File

@ -289,7 +289,7 @@
placeholder="Select Date"
min-date="currentDate"
max-date="futureDate"
close-text="Close" required="required"/>
close-text="Close" required="required" ng-readonly="true"/>
<span class="error text-small block"
ng-if="Form.date.$dirty && Form.date.$error.required">Date is required.</span>
<!--<span class="success text-small block"-->

38
Apollo/assets/views/student/studentDetailsModal.html
View File

@ -334,7 +334,26 @@
</tr>
</thead>
<tbody>
<tbody ng-if="course.markCardDetails.length!=0 && course.markCardDetails[0].FeesType=='F001'">
<tr ng-repeat="mark in course.markCardDetails | unique:'Sem'">
<td>
<span>{{mark.Sem_Year}} ({{mark.Sem}})</span>
</td>
<!--<td>
<span>{{mark.CertificateName}}</span>
</td>-->
<td>
<span>{{mark.ListName}} </span><span> &nbsp; ON &nbsp;</span> <span>{{mark.CDate}}</span>
</td>
<td>
<span>{{mark.Comments}}</span>
</td>
</tr>
</tbody>
<tbody ng-if="course.markCardDetails.length!=0 && course.markCardDetails[0].FeesType!='F001'">
<tr ng-repeat="mark in course.markCardDetails | unique:'CourseID'">
<td>
<span>{{mark.Sem_Year}}</span>
@ -379,7 +398,22 @@
</tr>
</thead>
<tbody>
<tbody ng-if="course.studyMaterialDetails.length!=0 && course.studyMaterialDetails[0].FeesType=='F001'">
<tr ng-repeat="study in course.studyMaterialDetails | unique:'Sem'">
<td>
<span>{{study.Sem_Year}} ({{study.Sem}})</span></td>
<!--<td>
<span>{{study.SDate}}</span></td>-->
<td>
<span>{{study.ListName}} </span><span> &nbsp; ON &nbsp;</span> <span>{{study.SDate}}</span>
</td>
<td>
<span>{{study.Comments}}</span></td>
</tr>
</tbody>
<tbody ng-if="course.studyMaterialDetails.length!=0 && course.studyMaterialDetails[0].FeesType!='F001'">
<tr ng-repeat="study in course.studyMaterialDetails | unique:'CourseID'">
<td>
<span>{{study.Sem_Year}}</span></td>

48
Apollo/assets/views/student/studentView.html
View File

@ -582,11 +582,11 @@
</tr>
</thead>
<tbody>
<tr ng-repeat="mark in course.markCardDetails | unique:'CourseID'">
<td>
<span>{{mark.Sem_Year}}</span>
</td>
<tbody ng-if="course.markCardDetails.length!=0 && course.markCardDetails[0].FeesType=='F001'">
<tr ng-repeat="mark in course.markCardDetails | unique:'Sem'">
<td>
<span>{{mark.Sem_Year}} ({{mark.Sem}})</span>
</td>
<!--<td>
<span>{{mark.CertificateName}}</span>
</td>-->
@ -601,6 +601,27 @@
</tr>
</tbody>
<tbody ng-if="course.markCardDetails.length!=0 && course.markCardDetails[0].FeesType!='F001'">
<tr ng-repeat="mark in course.markCardDetails | unique:'CourseID'">
<td>
<span>{{mark.Sem_Year}}</span>
</td>
<!--<td>
<span>{{mark.CertificateName}}</span>
</td>-->
<td>
<span>{{mark.ListName}} </span><span> &nbsp; ON &nbsp;</span> <span>{{mark.CDate}}</span>
</td>
<td>
<span>{{mark.Comments}}</span>
</td>
</tr>
</tbody>
</table>
<!--
@ -627,7 +648,22 @@
</tr>
</thead>
<tbody>
<tbody ng-if="course.studyMaterialDetails.length!=0 && course.studyMaterialDetails[0].FeesType=='F001'">
<tr ng-repeat="study in course.studyMaterialDetails | unique:'Sem'">
<td>
<span>{{study.Sem_Year}} ({{study.Sem}})</span></td>
<!--<td>
<span>{{study.SDate}}</span></td>-->
<td>
<span>{{study.ListName}} </span><span> &nbsp; ON &nbsp;</span> <span>{{study.SDate}}</span>
</td>
<td>
<span>{{study.Comments}}</span></td>
</tr>
</tbody>
<tbody ng-if="course.studyMaterialDetails.length!=0 && course.studyMaterialDetails[0].FeesType!='F001'">
<tr ng-repeat="study in course.studyMaterialDetails | unique:'CourseID'">
<td>
<span>{{study.Sem_Year}}</span></td>