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-26 12:05:07 +05:30
commit e520bc3fb6
7 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Apollo/assets/js/controllers/callTrackingCtrl.js
View File

@ -1729,7 +1729,7 @@ app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS"
}); });
} else { } else {
swal("Failed!", "This student is not registerd", "warning"); swal("Failed!", "This student is not registered", "warning");
$scope.courseEditLoading = false; $scope.courseEditLoading = false;
$scope.studentDetails = ""; $scope.studentDetails = "";
$scope.courseDetails = ""; $scope.courseDetails = "";

20
Apollo/assets/js/controllers/feesStatusCtrl.js
View File

@ -552,7 +552,19 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
* createdcby kms * createdcby kms
* */ * */
$scope.changeBatch = function (Details) { $scope.changeBatch = function (Details) {
$scope.setFeesTotalAmount(Details,'2','2');
if(Details.InstallmentDetails != ''){
$scope.setFeesTotalAmount(Details,'2','2');
}
else{
$rootScope.updateMoreItems=[];
$scope.setModel.feesType.Others = '';
$scope.setFeesTotalAmount(Details,'1','1');
}
} }
@ -649,7 +661,6 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
* change installment values * change installment values
* */ * */
$scope.changeInstallemt = function (model,form) { $scope.changeInstallemt = function (model,form) {
if(model.Sem_Year!='TC' && model.Sem_Year!='PC' && model.Sem_Year!='DC' && model.Sem_Year!='MC' && model.Sem_Year!='OTHER'){ if(model.Sem_Year!='TC' && model.Sem_Year!='PC' && model.Sem_Year!='DC' && model.Sem_Year!='MC' && model.Sem_Year!='OTHER'){
$scope.BatchDetails=[]; $scope.BatchDetails=[];
$rootScope.updateMoreItems=[]; $rootScope.updateMoreItems=[];
@ -1042,10 +1053,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
* created by kms * created by kms
* */ * */
$scope.calculateInstallemntsExist = function (model,totAmt,other,type,type1) { $scope.calculateInstallemntsExist = function (model,totAmt,other,type,type1) {
var exBatchDate = moment($scope.BatchDate); var exBatchDate = moment($scope.BatchDate);
if(type==2 || type==1){ if(type==2 || type==1){
if($rootScope.updateMoreItems.length>0){ if($rootScope.updateMoreItems.length>0){
var exDatenew1; var exDatenew1;
@ -1059,9 +1067,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
else{ else{
exDatenew1 = moment($rootScope.updateMoreItems[$rootScope.updateMoreItems.length-1].DueDate); exDatenew1 = moment($rootScope.updateMoreItems[$rootScope.updateMoreItems.length-1].DueDate);
} }
if (exDatenew1 <= exBatchDate) { if (exDatenew1 <= exBatchDate) {
if(type=='1'){ if(type=='1'){
$scope.setTotalAmount = Math.round(parseInt(totAmt)-parseInt(other)); $scope.setTotalAmount = Math.round(parseInt(totAmt)-parseInt(other));
// $scope.setModel.feesType.Others = Math.round(parseInt(other)); // $scope.setModel.feesType.Others = Math.round(parseInt(other));

4
Apollo/assets/views/sendSMS/sendSMSDetailssuperadmin.html
View File

@ -24,7 +24,7 @@
</label> </label>
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="searchData.date" <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="searchData.date"
is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions" is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
placeholder="Select Date" close-text="Close" required="required" ng-change="changeDate()" show-button-bar="true" placeholder="Select Date" close-text="Close" required="required" ng-change="changeDate()" show-button-bar="true" readonly
/> />
</div> </div>
@ -37,7 +37,7 @@
</label> </label>
<input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="searchData.dateTo" <input type="text" tabindex="1" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="searchData.dateTo"
is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions" is-open="startOpen" ng-init="startOpen = false" name="addDate" datepicker-options="dateOptions"
placeholder="Select Date" close-text="Close" required="required" ng-change="changeToDate()" show-button-bar="true" placeholder="Select Date" close-text="Close" required="required" ng-change="changeToDate()" show-button-bar="true" readonly
/> />
</div> </div>

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

@ -25,7 +25,7 @@
ng-model="setModel.feesType" ng-model="setModel.feesType"
ng-options="fees.Sem_Year for fees in feesStructureInfo" ng-options="fees.Sem_Year for fees in feesStructureInfo"
required> required>
<option value=""> Select Fees Type</option> <!-- <option value=""> Select Fees Type</option>-->
</select> </select>
<span class="error text-small block" <span class="error text-small block"
ng-if="Form.setfeesType.$dirty && Form.setfeesType.$invalid">Fees type is required</span> ng-if="Form.setfeesType.$dirty && Form.setfeesType.$invalid">Fees type is required</span>
@ -39,7 +39,7 @@
ng-model="setModel.feesType.BatchCode" ng-model="setModel.feesType.BatchCode"
ng-options="batch.BatchCode as batch.BatchName for batch in BatchDetails" ng-click="changeBatch(setModel.feesType);" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'" ng-options="batch.BatchCode as batch.BatchName for batch in BatchDetails" ng-click="changeBatch(setModel.feesType);" ng-disabled="setModel.feesType.ExistValue=='1' && userType=='R002'"
required> required>
<option value=""> Select Batch</option> <!-- <option value=""> Select Batch</option>-->
</select> </select>
<span class="error text-small block" <span class="error text-small block"
ng-if="Form.batchCode.$dirty && Form.batchCode.$invalid">Batch is required</span> ng-if="Form.batchCode.$dirty && Form.batchCode.$invalid">Batch is required</span>

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

@ -53,7 +53,7 @@
ng-model="updateModel.feesType" ng-model="updateModel.feesType"
ng-options="fees.Sem_Year for fees in studentFeesInfo" ng-options="fees.Sem_Year for fees in studentFeesInfo"
required ng-change="changeTotalFees(updateModel.feesType);"> required ng-change="changeTotalFees(updateModel.feesType);">
<option value=""> Select Fees Type</option> <!-- <option value=""> Select Fees Type</option>-->
</select> </select>
<span class="error text-small block" <span class="error text-small block"
ng-if="Form.feesType.$dirty && Form.feesType.$invalid">Fees type is required</span> ng-if="Form.feesType.$dirty && Form.feesType.$invalid">Fees type is required</span>
@ -413,7 +413,8 @@
</tr> </tr>
</thead> </thead>
<tbody dir-paginate="p in existStudentFeesDetails|orderBy:sortKey:reverse|filter:search:strict|itemsPerPage:10"> <tbody ng-repeat="p in existStudentFeesDetails|orderBy:sortKey:reverse|filter:search:strict">
<!-- itemsPerPage:10-->
<tr> <tr>
<td>{{p.FeesName}}</td> <td>{{p.FeesName}}</td>
<td>{{p.CourseName}}</td> <td>{{p.CourseName}}</td>
@ -532,8 +533,8 @@
</tbody> </tbody>
</table> </table>
<dir-pagination-controls max-size="10" direction-links="true" boundary-links="true"> <!-- <dir-pagination-controls max-size="10" direction-links="true" boundary-links="true">
</dir-pagination-controls> </dir-pagination-controls>-->
</div> </div>
</div> </div>

10
Apollo/assets/views/student/student_details.html
View File

@ -11,7 +11,9 @@
<!-- end: STUDENT TITLE --> <!-- end: STUDENT TITLE -->
<!-- start: LIST GROUP --> <!-- start: LIST GROUP -->
<div class="container-fluid container-fullw bg-white"> <div class="container-fluid container-fullw bg-white">
<style> <style>
/*#wrapper { /*#wrapper {
width: 200px; width: 200px;
height: 110px; height: 110px;
@ -327,7 +329,7 @@
<label> <label>
First Name <span class="symbol required"></span> First Name <span class="symbol required"></span>
</label> </label>
<input type="text" placeholder="Enter First Name" tabindex="2" class="form-control" name="firstname" ng-model="myModel.firstname" <input type="text" placeholder="Enter First Name" tabindex="2" class="form-control" name="firstname" ng-model="myModel.firstname" style="text-transform: capitalize;"
ng-pattern="/^[a-zA-Z.\s]*$/" required/> ng-pattern="/^[a-zA-Z.\s]*$/" required/>
<span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.required">First Name is required</span> <span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.required">First Name is required</span>
<span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.pattern">Invalid First Name </span> <span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.pattern">Invalid First Name </span>
@ -336,7 +338,7 @@
<label> <label>
Last Name <span class="symbol required"></span> Last Name <span class="symbol required"></span>
</label> </label>
<input type="text" placeholder="Enter Last Name" tabindex="3" class="form-control" name="lastname" ng-model="myModel.lastname" <input type="text" placeholder="Enter Last Name" tabindex="3" class="form-control" name="lastname" ng-model="myModel.lastname" style="text-transform: capitalize;"
ng-pattern="/^[a-zA-Z.\s]*$/" required/> ng-pattern="/^[a-zA-Z.\s]*$/" required/>
<span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.required">Last Name is required</span> <span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.required">Last Name is required</span>
<span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.pattern">Invalid Last Name </span> <span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.pattern">Invalid Last Name </span>
@ -347,7 +349,7 @@
<label> <label>
Father Name <span class="symbol required"></span> Father Name <span class="symbol required"></span>
</label> </label>
<input type="text" placeholder="Enter Father Name" tabindex="4" class="form-control" name="fathername" ng-model="myModel.fathername" <input type="text" placeholder="Enter Father Name" tabindex="4" class="form-control" name="fathername" ng-model="myModel.fathername" style="text-transform: capitalize;"
ng-pattern="/^[a-zA-Z.\s]*$/" required/> ng-pattern="/^[a-zA-Z.\s]*$/" required/>
<span class="error text-small block" ng-if="Form.fathername.$dirty && Form.fathername.$error.required">Father Name is required</span> <span class="error text-small block" ng-if="Form.fathername.$dirty && Form.fathername.$error.required">Father Name is required</span>
<span class="error text-small block" ng-if="Form.fathername.$dirty && Form.fathername.$error.pattern">Invalid Father Name </span> <span class="error text-small block" ng-if="Form.fathername.$dirty && Form.fathername.$error.pattern">Invalid Father Name </span>
@ -357,7 +359,7 @@
Mother Name <span class="symbol required"></span> Mother Name <span class="symbol required"></span>
</label> </label>
<input type="text" placeholder="Enter Mother Name" tabindex="5" class="form-control" name="mothername" ng-model="myModel.mothername" <input type="text" placeholder="Enter Mother Name" tabindex="5" class="form-control" name="mothername" ng-model="myModel.mothername" style="text-transform: capitalize;"
ng-pattern="/^[a-zA-Z.\s]*$/" required/> ng-pattern="/^[a-zA-Z.\s]*$/" required/>
<span class="error text-small block" ng-if="Form.mothername.$dirty && Form.mothername.$error.required">Mother Name is required</span> <span class="error text-small block" ng-if="Form.mothername.$dirty && Form.mothername.$error.required">Mother Name is required</span>
<span class="error text-small block" ng-if="Form.mothername.$dirty && Form.mothername.$error.pattern">Invalid Mother Name </span> <span class="error text-small block" ng-if="Form.mothername.$dirty && Form.mothername.$error.pattern">Invalid Mother Name </span>

8
Apollo/assets/views/student/student_details_SuperAdmin.html
View File

@ -351,7 +351,7 @@
<label> <label>
First Name <span class="symbol required"></span> First Name <span class="symbol required"></span>
</label> </label>
<input type="text" placeholder="Enter First Name" tabindex="2" class="form-control" name="firstname" ng-model="myModel.firstname" <input type="text" placeholder="Enter First Name" tabindex="2" class="form-control" style="text-transform: capitalize;" name="firstname" ng-model="myModel.firstname"
ng-pattern="/^[a-zA-Z.\s]*$/" required/> ng-pattern="/^[a-zA-Z.\s]*$/" required/>
<span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.required">First Name is required</span> <span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.required">First Name is required</span>
<span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.pattern">Invalid First Name </span> <span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.pattern">Invalid First Name </span>
@ -360,7 +360,7 @@
<label> <label>
Last Name <span class="symbol required"></span> Last Name <span class="symbol required"></span>
</label> </label>
<input type="text" placeholder="Enter Last Name" tabindex="3" class="form-control" name="lastname" ng-model="myModel.lastname" <input type="text" placeholder="Enter Last Name" tabindex="3" class="form-control" name="lastname" ng-model="myModel.lastname" style="text-transform: capitalize;"
ng-pattern="/^[a-zA-Z.\s]*$/" required/> ng-pattern="/^[a-zA-Z.\s]*$/" required/>
<span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.required">Last Name is required</span> <span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.required">Last Name is required</span>
<span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.pattern">Invalid Last Name </span> <span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.pattern">Invalid Last Name </span>
@ -371,7 +371,7 @@
<label> <label>
Father Name <span class="symbol required"></span> Father Name <span class="symbol required"></span>
</label> </label>
<input type="text" placeholder="Enter Father Name" tabindex="4" class="form-control" name="fathername" ng-model="myModel.fathername" <input type="text" placeholder="Enter Father Name" tabindex="4" class="form-control" name="fathername" ng-model="myModel.fathername" style="text-transform: capitalize;"
ng-pattern="/^[a-zA-Z.\s]*$/" required/> ng-pattern="/^[a-zA-Z.\s]*$/" required/>
<span class="error text-small block" ng-if="Form.fathername.$dirty && Form.fathername.$error.required">Father Name is required</span> <span class="error text-small block" ng-if="Form.fathername.$dirty && Form.fathername.$error.required">Father Name is required</span>
<span class="error text-small block" ng-if="Form.fathername.$dirty && Form.fathername.$error.pattern">Invalid Father Name </span> <span class="error text-small block" ng-if="Form.fathername.$dirty && Form.fathername.$error.pattern">Invalid Father Name </span>
@ -381,7 +381,7 @@
Mother Name <span class="symbol required"></span> Mother Name <span class="symbol required"></span>
</label> </label>
<input type="text" placeholder="Enter Mother Name" tabindex="5" class="form-control" name="mothername" ng-model="myModel.mothername" <input type="text" placeholder="Enter Mother Name" tabindex="5" class="form-control" name="mothername" ng-model="myModel.mothername" style="text-transform: capitalize;"
ng-pattern="/^[a-zA-Z.\s]*$/" required/> ng-pattern="/^[a-zA-Z.\s]*$/" required/>
<span class="error text-small block" ng-if="Form.mothername.$dirty && Form.mothername.$error.required">Mother Name is required</span> <span class="error text-small block" ng-if="Form.mothername.$dirty && Form.mothername.$error.required">Mother Name is required</span>
<span class="error text-small block" ng-if="Form.mothername.$dirty && Form.mothername.$error.pattern">Invalid Mother Name </span> <span class="error text-small block" ng-if="Form.mothername.$dirty && Form.mothername.$error.pattern">Invalid Mother Name </span>