Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec
This commit is contained in:
dineshkumarkannan
commit
0bf1936ea2
@ -2176,6 +2176,7 @@ app.controller('FeesModalInstanceCtrl', ["$scope", "$modalInstance", "items","Wo
|
||||
};
|
||||
//show hide function for pdf design
|
||||
$scope.billNo="";
|
||||
$scope.receiptNo="";
|
||||
$scope.sessionName="";
|
||||
$scope.paymentType="";
|
||||
$scope.billDate="";
|
||||
@ -2198,7 +2199,7 @@ app.controller('FeesModalInstanceCtrl', ["$scope", "$modalInstance", "items","Wo
|
||||
$scope.BranchAddr = pdfValue.Address;
|
||||
$scope.BranchLogo = pdfValue.LogoPath;
|
||||
$scope.FeesReceiptTitle = pdfValue.FeesReceiptTitle;
|
||||
|
||||
$scope.receiptNo=pdfValue.ReceiptNo;
|
||||
|
||||
}
|
||||
|
||||
@ -2215,6 +2216,7 @@ app.controller('FeesModalInstanceCtrl', ["$scope", "$modalInstance", "items","Wo
|
||||
$scope.BranchAddr = "";
|
||||
$scope.BranchLogo = "";
|
||||
$scope.FeesReceiptTitle="";
|
||||
$scope.receiptNo="";
|
||||
}
|
||||
|
||||
}]);
|
||||
|
||||
@ -1196,7 +1196,6 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
|
||||
|
||||
$scope.studentEntrollPendingDocFORM = {
|
||||
submit: function (form, myModelAddPendingDocDetails, stuID) {
|
||||
$scope.documentTrackAddDetailsLoading = true;
|
||||
var firstError = null;
|
||||
if (form.$invalid) {
|
||||
var field = null, firstError = null;
|
||||
@ -1213,11 +1212,14 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
|
||||
angular.element('.ng-invalid[name=' + firstError + ']').focus();
|
||||
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
|
||||
} else {
|
||||
$scope.documentTrackAddDetailsLoading = true;
|
||||
$scope.docFollowupDate = new Date(myModelAddPendingDocDetails.documentDate).toDateString();
|
||||
|
||||
var ModelDetails = {
|
||||
"student": stuID,
|
||||
"doc_Details": myModelAddPendingDocDetails.documentDetails,
|
||||
"checkTracking": myModelAddPendingDocDetails.checkTracking,
|
||||
"documentdate": myModelAddPendingDocDetails.date
|
||||
"documentdate": $filter('date')(new Date($scope.docFollowupDate),'dd-MM-yyyy')
|
||||
};
|
||||
var updateStudentPendingDocDetails = {
|
||||
method: 'POST',
|
||||
@ -1238,6 +1240,7 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
|
||||
"documentDetails": "",
|
||||
"checkTracking": false
|
||||
}
|
||||
form.$setPristine(true);
|
||||
} else {
|
||||
swal(" ", res.data.message, "error");
|
||||
$scope.documentTrackAddDetailsLoading = false;
|
||||
@ -2734,7 +2737,6 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl
|
||||
|
||||
$scope.studentEntrollPendingDocFORM = {
|
||||
submit: function (form, myModelAddPendingDocDetails, stuID) {
|
||||
$scope.documentTrackAddDetailsLoading = true;
|
||||
var firstError = null;
|
||||
if (form.$invalid) {
|
||||
var field = null, firstError = null;
|
||||
@ -2751,6 +2753,7 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl
|
||||
angular.element('.ng-invalid[name=' + firstError + ']').focus();
|
||||
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
|
||||
} else {
|
||||
$scope.documentTrackAddDetailsLoading = true;
|
||||
$scope.docFollowupDate = new Date(myModelAddPendingDocDetails.documentDate).toDateString();
|
||||
//alert($filter('date')(new Date($scope.docFollowupDate),'dd-MM-yyyy'));
|
||||
// exist();
|
||||
@ -2779,6 +2782,7 @@ app.controller('studentSuperAdminCtrl', ["$scope", "toaster", "$filter", "ngTabl
|
||||
"documentDetails": "",
|
||||
"checkTracking": false
|
||||
}
|
||||
form.$setPristine(true);
|
||||
} else {
|
||||
swal(" ", res.data.message, "error");
|
||||
$scope.documentTrackAddDetailsLoading = false;
|
||||
|
||||
@ -460,7 +460,8 @@
|
||||
<td style="width: 150px; height: 50px; text-align: center; border-bottom-style: hidden;padding-left:25%;" colspan="3">
|
||||
<span style="border: 2px solid black; padding: 10px; border-radius: 15px; font-size: 14px; color: #fff; background-color: black;">FEES ESTIMATE</span>
|
||||
</td>
|
||||
<td style="width: 137px; height: 50px; border-left-style: hidden; border-bottom-style: hidden;"><!--<strong>DOM:</strong>--> {{billNo}}</td>
|
||||
<td style="width: 137px; height: 50px; border-left-style: hidden; border-bottom-style: hidden;"><!--<strong>DOM:</strong>--> {{billNo}}<span ng-if="receiptNo!=''"> / {{receiptNo}}</span></td>
|
||||
|
||||
</tr>
|
||||
<tr style="height: 24px;">
|
||||
<td style="width: 136px; height: 24px;" colspan="3"><!--<strong>RECEIVED FROM</strong>--></td>
|
||||
|
||||
@ -550,7 +550,7 @@
|
||||
<form name="FormPendDoc" id="formPendDoc" novalidate ng-submit="studentEntrollPendingDocFORM.submit(FormPendDoc, myModelAddPendingDocDetails, p.StudentID)"
|
||||
method="post">
|
||||
<div class="row">
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':FormPendDoc.documentDetails.$dirty && FormPendDoc.documentDetails.$invalid, 'has-success':FormPendDoc.documentDetails.$valid}">
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':FormPendDoc.pendingDocumentTextarea.$dirty && FormPendDoc.pendingDocumentTextarea.$invalid, 'has-success':FormPendDoc.pendingDocumentTextarea.$valid}">
|
||||
<label>
|
||||
Pending Document Details <span
|
||||
class="symbol required"></span>
|
||||
@ -559,20 +559,25 @@
|
||||
ng-model="myModelAddPendingDocDetails.documentDetails" id="pendingDocumentTextarea" maxlength="100"
|
||||
required/>
|
||||
<span class="text-small block" style="color: rgba(128, 128, 128, 0.64)">Max 100 Characters.</span>
|
||||
<span class="error text-small block" ng-if="FormPendDoc.documentDetails.$dirty && FormPendDoc.documentDetails.$invalid" ng-hide="FormPendDoc.documentDetails.$error.maxlength || FormPendDoc.documentDetails.$error.minlength || FormPendDoc.documentDetails.$error.pattern">Pending Document Details required.</span>
|
||||
<span class="error text-small block" ng-if="FormPendDoc.pendingDocumentTextarea.$dirty && FormPendDoc.pendingDocumentTextarea.$invalid">Pending document details required.</span>
|
||||
<span class="error text-small block"
|
||||
ng-if="FormDoc.FormPendDoc.$error.maxlength || FormPendDoc.pendingDocumentTextarea.$error.pattern">Enter a valid document details</span>
|
||||
</div>
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':FormPendDoc.documentDetails.$dirty && FormPendDoc.documentDetails.$invalid, 'has-success':FormPendDoc.documentDetails.$valid}">
|
||||
<div data-ng-controller="DatepickerDemoCtrl">
|
||||
|
||||
|
||||
<div class="col-md-4 form-group" ng-class="{'has-error':FormPendDoc.FormPendDate.$dirty && FormPendDoc.FormPendDate.$invalid, 'has-success':FormPendDoc.FormPendDate.$valid}">
|
||||
|
||||
<div data-ng-controller="DatepickerDemoCtrl">
|
||||
|
||||
<label>
|
||||
Follow-up date<span
|
||||
class="symbol required"></span>
|
||||
</label>
|
||||
<input type="text" tabindex="1" class="form-control " ng-click="startOpen =!startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModelAddPendingDocDetails.documentDate"
|
||||
is-open="startOpen" ng-init="startOpen = false" name="date" datepicker-options="dateOptions"
|
||||
<input type="text" tabindex="1" class="form-control " ng-click="startOpen =!startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModelAddPendingDocDetails.documentDate" min-date="currentDate"
|
||||
is-open="startOpen" ng-init="startOpen = false" name="FormPendDate" datepicker-options="dateOptions"
|
||||
placeholder="Select Date" close-text="Close" ng-change="getDateFormat(p.SessionDate,'2');"
|
||||
required="required" ng-readonly="true" />
|
||||
<span class="error text-small block" ng-if="Form.date.$dirty && Form.date.$error.required">Session date is required.</span>
|
||||
<span class="error text-small block" ng-if="FormPendDoc.FormPendDate.$dirty && FormPendDoc.FormPendDate.$error.required">Follow-up date is required.</span>
|
||||
<!--<span class="success text-small block"-->
|
||||
<!--ng-if="Form.date.$valid ">Thank You</span>-->
|
||||
</div>
|
||||
@ -603,7 +608,7 @@
|
||||
<label>
|
||||
</label>
|
||||
<div>
|
||||
<button tooltip="Upload" type="submit" ng-disabled="disableButton" tabindex="4002" class="btn btn-xs btn-success">
|
||||
<button tooltip="Add" type="submit" ng-disabled="disableButton" tabindex="4002" class="btn btn-xs btn-success">
|
||||
Add
|
||||
</button>
|
||||
<button tooltip="Reset" class="btn btn-warning btn-xs" tabindex="4003" ng-click="studentEntrollPendingDocFORM.reset(FormPendDoc)">
|
||||
@ -617,8 +622,9 @@
|
||||
<h5 ng-show="documentTrackAddDetailsLoading" style="color:#007AFF">Loading...</h5>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
</fieldset>
|
||||
<div id="documentDetalils" ng-init="getStudentPendingEntrolDocDetails(p.StudentID)">
|
||||
<div class="table-responsive">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user