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

set current date in status updation

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-12-07 15:57:04 +05:30
parent e928ac3444
commit 4f7fc35d1e
12 changed files with 63 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Apollo/api/application/models/Reports_model.php
View File

@ -542,7 +542,7 @@ left join BalFees bal on bal.student=sms.sid and bal.feestype=sms.cid and bal.se
ifnull(STU_COUR.EnrollmentID,'-') as EnrollmentNumber, ifnull(STU_COUR.EnrollmentID,'-') as EnrollmentNumber,
CFD.Sem_Year as Sem_Year, CFD.Sem_Year as Sem_Year,
RD.RegistrationType as FormType, RD.RegistrationType as FormType,
STU.StudentID as Student_id,sfs.RollNo as StudentRollNo STU.StudentID as Student_id,ifnull(sfs.RollNo,'-') as StudentRollNo
FROM T_ApplicationFormStatus AS APFS FROM T_ApplicationFormStatus AS APFS
LEFT JOIN T_Registration_Details AS RD ON RD.ID = APFS.Registration_Details_ID LEFT JOIN T_Registration_Details AS RD ON RD.ID = APFS.Registration_Details_ID
LEFT JOIN T_PickListDetails AS PKL ON PKL.ListCode = APFS.ListCode LEFT JOIN T_PickListDetails AS PKL ON PKL.ListCode = APFS.ListCode

13
Apollo/assets/js/controllers/answerBookletStatusCtrl.js
View File

@ -21,6 +21,9 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
$scope.editId = -1; $scope.editId = -1;
} }
// get local client details // get local client details
var localDetail = JSON.parse(localStorage.getItem('localObj')); var localDetail = JSON.parse(localStorage.getItem('localObj'));
var localDetails = ipCookie('cookiechk'); var localDetails = ipCookie('cookiechk');
@ -28,6 +31,8 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
$scope.localTypeSuperAdmin = false; $scope.localTypeSuperAdmin = false;
$scope.localBranchDetails = ''; $scope.localBranchDetails = '';
$scope.init = function () { $scope.init = function () {
// var logcheck = JSON.parse(localStorage.getItem('localObj')); // var logcheck = JSON.parse(localStorage.getItem('localObj'));
@ -105,6 +110,8 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
$scope.universityData = ''; $scope.universityData = '';
// get university list when the page is loading // get university list when the page is loading
$scope.getUniversityList = function () { $scope.getUniversityList = function () {
var empListreq = { var empListreq = {
method: 'POST', method: 'POST',
url: apiPoint.url + 'getUniveCourseBratch/', url: apiPoint.url + 'getUniveCourseBratch/',
@ -124,6 +131,12 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
}; };
$scope.getUniveId = function (univ) { $scope.getUniveId = function (univ) {
//alert('in');
$scope.Currentdate = new Date();
console.log($scope.Currentdate);
let name = JSON.parse(univ); let name = JSON.parse(univ);
$scope.searchData.University = name.UniversityID; $scope.searchData.University = name.UniversityID;
$scope.searchData.Course = ''; $scope.searchData.Course = '';

8
Apollo/assets/js/controllers/applicationStatusCtrl.js
View File

@ -36,6 +36,8 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
$scope.init = function () { $scope.init = function () {
// var logcheck = JSON.parse(localStorage.getItem('localObj')); // var logcheck = JSON.parse(localStorage.getItem('localObj'));
// const LOCALTYPE = logcheck.localType; // const LOCALTYPE = logcheck.localType;
@ -123,6 +125,12 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
}; };
$scope.getUniveId = function (univ) { $scope.getUniveId = function (univ) {
alert('in')
$scope.Currentdate = new Date();
console.log($scope.Currentdate);
let name = JSON.parse(univ); let name = JSON.parse(univ);
$scope.searchData.University = name.UniversityID; $scope.searchData.University = name.UniversityID;
$scope.searchData.Course = ''; $scope.searchData.Course = '';

12
Apollo/assets/js/controllers/certificateStatusCtrl.js
View File

@ -52,6 +52,8 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
// } // }
// } // }
if (localDetail != null) { if (localDetail != null) {
if (localDetails.localType === 'R004') { if (localDetails.localType === 'R004') {
$scope.localTypeSuperAdmin = true; $scope.localTypeSuperAdmin = true;
@ -152,6 +154,14 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
}; };
$scope.getUniveId = function (univ) { $scope.getUniveId = function (univ) {
alert('in')
$scope.Currentdate = new Date();
console.log($scope.Currentdate);
let name = JSON.parse(univ); let name = JSON.parse(univ);
$scope.searchData.University = name.UniversityID; $scope.searchData.University = name.UniversityID;
$scope.searchData.Course = ''; $scope.searchData.Course = '';
@ -249,6 +259,8 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
// Select one row in a table once // Select one row in a table once
$scope.setOneSelect = function (value) { $scope.setOneSelect = function (value) {
// alert('inset')
// alert(JSON.stringify(value)); // alert(JSON.stringify(value));
angular.forEach($scope.searchResultDetails, function (item) { angular.forEach($scope.searchResultDetails, function (item) {
item.Selected = false; item.Selected = false;

5
Apollo/assets/js/controllers/markcardStatusCtrl.js
View File

@ -143,6 +143,11 @@ app.controller('markcardStatusCtrl', ["$scope", "toaster", "$filter", "ngTablePa
}; };
$scope.getUniveId = function (univ) { $scope.getUniveId = function (univ) {
alert();
$scope.Currentdate = new Date();
console.log($scope.Currentdate);
let name = JSON.parse(univ); let name = JSON.parse(univ);
$scope.searchData.University = name.UniversityID; $scope.searchData.University = name.UniversityID;
$scope.searchData.Course = ''; $scope.searchData.Course = '';

3
Apollo/assets/js/controllers/report_app_pendingCtrl.js
View File

@ -148,6 +148,9 @@ $scope.generateButtonStatus = false;
if (response.data.app_pendingList == true) { if (response.data.app_pendingList == true) {
$scope.isLoaderShow1 =false; $scope.isLoaderShow1 =false;
$scope.app_pending_data = response.data.app_pending_data; $scope.app_pending_data = response.data.app_pending_data;
console.log($scope.app_pending_data);
for(var i=0;i<$scope.app_pending_data.length;i++) for(var i=0;i<$scope.app_pending_data.length;i++)
$scope.app_pending_data[i].SL_NO = i+1; $scope.app_pending_data[i].SL_NO = i+1;

7
Apollo/assets/js/controllers/studyMaterialStatusCtrl.js
View File

@ -329,6 +329,9 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
} }
$scope.maxDateForStatusUpdt = ''; $scope.maxDateForStatusUpdt = '';
$scope.Currentdate= new Date();
$scope.statusCheck = function(sts){ $scope.statusCheck = function(sts){
let stas = JSON.parse(sts); let stas = JSON.parse(sts);
$scope.myStatusModel.staus = stas.ListCode; $scope.myStatusModel.staus = stas.ListCode;
@ -493,7 +496,11 @@ app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS"
$scope.open = function (studentDetails) { $scope.open = function (studentDetails) {
$scope.Currentdate = new Date();
console.log($scope.Currentdate);
// get student view details // get student view details
var getcourse = { var getcourse = {
method: 'POST', method: 'POST',

6
Apollo/assets/views/status-update/answer_booklet_status.html
View File

@ -288,7 +288,10 @@
<input type="text" tabindex="6" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myStatusModel.dateOn" <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" is-open="startOpen" ng-init="startOpen = false" name="dateofstaus"
datepicker-options="dateOptions" placeholder="Select Date " close-text="Close" datepicker-options="dateOptions" placeholder="Select Date " close-text="Close"
required="required" ng-change="getMaxEndDate(myModel.startDate)" required="required" ng-change="getMaxEndDate(myModel.startDate)"
min-date="Currentdate" min-date="Currentdate" max-date="Currentdate"
/> />
<span class="error text-small block" ng-if="Form.dateofstaus.$dirty && Form.dateofstaus.$invalid" ng-hide="Form.dateofstaus.$error.maxlength">Date is required.</span> <span class="error text-small block" ng-if="Form.dateofstaus.$dirty && Form.dateofstaus.$invalid" ng-hide="Form.dateofstaus.$error.maxlength">Date is required.</span>
@ -393,6 +396,7 @@
is-open="startOpen" ng-init="startOpen = false" name="dateofstaus" is-open="startOpen" ng-init="startOpen = false" name="dateofstaus"
datepicker-options="dateOptions" placeholder="Select Date " close-text="Close" datepicker-options="dateOptions" placeholder="Select Date " close-text="Close"
required="required" ng-change="getMaxEndDate(myModel.startDate)" required="required" ng-change="getMaxEndDate(myModel.startDate)"
min-date="Currentdate" max-date="Currentdate"
/> />
<span class="error text-small block" ng-if="Form.dateofstaus.$dirty && Form.dateofstaus.$invalid" ng-hide="Form.dateofstaus.$error.maxlength">Date is required.</span> <span class="error text-small block" ng-if="Form.dateofstaus.$dirty && Form.dateofstaus.$invalid" ng-hide="Form.dateofstaus.$error.maxlength">Date is required.</span>
<span class="error text-small block" ng-if="Form.dateofstaus.$error.maxlength">Enter a Valid Date</span> <span class="error text-small block" ng-if="Form.dateofstaus.$error.maxlength">Enter a Valid Date</span>

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

@ -288,6 +288,8 @@
datepicker-options="dateOptions" placeholder="Select Date " close-text="Close" datepicker-options="dateOptions" placeholder="Select Date " close-text="Close"
max-date="minDate" max-date="minDate"
required="required" ng-change="getMaxEndDate(myModel.startDate)" required="required" ng-change="getMaxEndDate(myModel.startDate)"
min-date="Currentdate" max-date="Currentdate"
/> />
<span class="error text-small block" ng-if="Form.dateofstaus.$dirty && Form.dateofstaus.$invalid" ng-hide="Form.dateofstaus.$error.maxlength">Date is required.</span> <span class="error text-small block" ng-if="Form.dateofstaus.$dirty && Form.dateofstaus.$invalid" ng-hide="Form.dateofstaus.$error.maxlength">Date is required.</span>
@ -485,6 +487,7 @@
datepicker-options="dateOptions" placeholder="Select Date " close-text="Close" datepicker-options="dateOptions" placeholder="Select Date " close-text="Close"
max-date="minDate" max-date="minDate"
required="required" ng-change="getMaxEndDate(myModel.startDate)" required="required" ng-change="getMaxEndDate(myModel.startDate)"
min-date="Currentdate" max-date="Currentdate"
/> />
<span class="error text-small block" ng-if="Form.dateofstaus.$dirty && Form.dateofstaus.$invalid" ng-hide="Form.dateofstaus.$error.maxlength">Date is required.</span> <span class="error text-small block" ng-if="Form.dateofstaus.$dirty && Form.dateofstaus.$invalid" ng-hide="Form.dateofstaus.$error.maxlength">Date is required.</span>

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

@ -286,6 +286,7 @@
is-open="startOpen" ng-init="startOpen = false" name="dateofstaus" is-open="startOpen" ng-init="startOpen = false" name="dateofstaus"
datepicker-options="dateOptions" placeholder="Select Date " close-text="Close" datepicker-options="dateOptions" placeholder="Select Date " close-text="Close"
required="required" ng-change="getMaxEndDate(myModel.startDate)" required="required" ng-change="getMaxEndDate(myModel.startDate)"
min-date="Currentdate" max-date="Currentdate"
/> />
<span class="error text-small block" ng-if="Form.dateofstaus.$dirty && Form.dateofstaus.$invalid" ng-hide="Form.dateofstaus.$error.maxlength">Date is required.</span> <span class="error text-small block" ng-if="Form.dateofstaus.$dirty && Form.dateofstaus.$invalid" ng-hide="Form.dateofstaus.$error.maxlength">Date is required.</span>
<span class="error text-small block" ng-if="Form.dateofstaus.$error.maxlength">Enter a Valid Date</span> <span class="error text-small block" ng-if="Form.dateofstaus.$error.maxlength">Enter a Valid Date</span>
@ -397,6 +398,7 @@
is-open="startOpen" ng-init="startOpen = false" name="dateofstaus" is-open="startOpen" ng-init="startOpen = false" name="dateofstaus"
datepicker-options="dateOptions" placeholder="Select Date " close-text="Close" datepicker-options="dateOptions" placeholder="Select Date " close-text="Close"
required="required" ng-change="getMaxEndDate(myModel.startDate)" required="required" ng-change="getMaxEndDate(myModel.startDate)"
min-date="Currentdate" max-date="Currentdate"
/> />
<span class="error text-small block" ng-if="Form.dateofstaus.$dirty && Form.dateofstaus.$invalid" ng-hide="Form.dateofstaus.$error.maxlength">Date is required.</span> <span class="error text-small block" ng-if="Form.dateofstaus.$dirty && Form.dateofstaus.$invalid" ng-hide="Form.dateofstaus.$error.maxlength">Date is required.</span>

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

@ -303,6 +303,7 @@
is-open="startOpen" ng-init="startOpen = false" name="dateofstaus" is-open="startOpen" ng-init="startOpen = false" name="dateofstaus"
datepicker-options="dateOptions" placeholder="Select Date " close-text="Close" datepicker-options="dateOptions" placeholder="Select Date " close-text="Close"
required="required" ng-change="getMaxEndDate(myModel.startDate)" required="required" ng-change="getMaxEndDate(myModel.startDate)"
min-date="Currentdate" max-date="Currentdate"
/> />
<span class="error text-small block" ng-if="Form.dateofstaus.$dirty && Form.dateofstaus.$invalid" ng-hide="Form.dateofstaus.$error.maxlength">Date is required.</span> <span class="error text-small block" ng-if="Form.dateofstaus.$dirty && Form.dateofstaus.$invalid" ng-hide="Form.dateofstaus.$error.maxlength">Date is required.</span>
@ -420,6 +421,7 @@
is-open="startOpen" ng-init="startOpen = false" name="dateofstaus" is-open="startOpen" ng-init="startOpen = false" name="dateofstaus"
datepicker-options="dateOptions" placeholder="Select Date " close-text="Close" datepicker-options="dateOptions" placeholder="Select Date " close-text="Close"
required="required" ng-change="getMaxEndDate(myModel.startDate)" required="required" ng-change="getMaxEndDate(myModel.startDate)"
min-date="Currentdate" max-date="Currentdate"
/> />
<span class="error text-small block" ng-if="Form.dateofstaus.$dirty && Form.dateofstaus.$invalid" ng-hide="Form.dateofstaus.$error.maxlength">Date is required.</span> <span class="error text-small block" ng-if="Form.dateofstaus.$dirty && Form.dateofstaus.$invalid" ng-hide="Form.dateofstaus.$error.maxlength">Date is required.</span>
<span class="error text-small block" ng-if="Form.dateofstaus.$error.maxlength">Enter a Valid Date</span> <span class="error text-small block" ng-if="Form.dateofstaus.$error.maxlength">Enter a Valid Date</span>

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

@ -352,7 +352,7 @@
<div class="col-md-8"> <div class="col-md-8">
<fieldset style="background-color: #eaeaea;"> <fieldset style="background-color: #eaeaea;">
<legend> <legend>
Update Status2 Update Status
</legend> </legend>
<div> <div>
<a id="cancel_button" ng-click="unSelect()" tooltip="Close"> <a id="cancel_button" ng-click="unSelect()" tooltip="Close">
@ -408,7 +408,7 @@
<input type="text" tabindex="6" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myStatusModel.dateOn" <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" is-open="startOpen" ng-init="startOpen = false" name="dateofstaus"
datepicker-options="dateOptions" placeholder="Select Date " datepicker-options="dateOptions" placeholder="Select Date "
close-text="Close" required="required" ng-change="getMaxEndDate(myModel.startDate)" max-date="maxDateForStatusUpdt" close-text="Close" required="required" ng-change="getMaxEndDate(myModel.startDate)" min-date="Currentdate" max-date="Currentdate"
/> />
<span class="error text-small block" ng-if="Form.dateofstaus.$dirty && Form.dateofstaus.$invalid" ng-hide="Form.dateofstaus.$error.maxlength">Date is required.</span> <span class="error text-small block" ng-if="Form.dateofstaus.$dirty && Form.dateofstaus.$invalid" ng-hide="Form.dateofstaus.$error.maxlength">Date is required.</span>
<span class="error text-small block" ng-if="Form.dateofstaus.$error.maxlength">Enter a Valid Date</span> <span class="error text-small block" ng-if="Form.dateofstaus.$error.maxlength">Enter a Valid Date</span>