diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php
index 338da997..833c9e52 100755
--- a/Apollo/api/application/models/Reports_model.php
+++ b/Apollo/api/application/models/Reports_model.php
@@ -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,
CFD.Sem_Year as Sem_Year,
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
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
diff --git a/Apollo/assets/js/controllers/answerBookletStatusCtrl.js b/Apollo/assets/js/controllers/answerBookletStatusCtrl.js
index 7f76b306..08e4950f 100755
--- a/Apollo/assets/js/controllers/answerBookletStatusCtrl.js
+++ b/Apollo/assets/js/controllers/answerBookletStatusCtrl.js
@@ -21,6 +21,9 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
$scope.editId = -1;
}
+
+
+
// get local client details
var localDetail = JSON.parse(localStorage.getItem('localObj'));
var localDetails = ipCookie('cookiechk');
@@ -28,6 +31,8 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
$scope.localTypeSuperAdmin = false;
$scope.localBranchDetails = '';
+
+
$scope.init = function () {
// var logcheck = JSON.parse(localStorage.getItem('localObj'));
@@ -105,6 +110,8 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
$scope.universityData = '';
// get university list when the page is loading
$scope.getUniversityList = function () {
+
+
var empListreq = {
method: 'POST',
url: apiPoint.url + 'getUniveCourseBratch/',
@@ -124,6 +131,12 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
};
$scope.getUniveId = function (univ) {
+
+ //alert('in');
+
+ $scope.Currentdate = new Date();
+
+ console.log($scope.Currentdate);
let name = JSON.parse(univ);
$scope.searchData.University = name.UniversityID;
$scope.searchData.Course = '';
diff --git a/Apollo/assets/js/controllers/applicationStatusCtrl.js b/Apollo/assets/js/controllers/applicationStatusCtrl.js
index 0ad95cc8..faa9ea5a 100644
--- a/Apollo/assets/js/controllers/applicationStatusCtrl.js
+++ b/Apollo/assets/js/controllers/applicationStatusCtrl.js
@@ -36,6 +36,8 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
$scope.init = function () {
+
+
// var logcheck = JSON.parse(localStorage.getItem('localObj'));
// const LOCALTYPE = logcheck.localType;
@@ -123,6 +125,12 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
};
$scope.getUniveId = function (univ) {
+
+ alert('in')
+ $scope.Currentdate = new Date();
+
+ console.log($scope.Currentdate);
+
let name = JSON.parse(univ);
$scope.searchData.University = name.UniversityID;
$scope.searchData.Course = '';
diff --git a/Apollo/assets/js/controllers/certificateStatusCtrl.js b/Apollo/assets/js/controllers/certificateStatusCtrl.js
index 55982296..3f16faf8 100644
--- a/Apollo/assets/js/controllers/certificateStatusCtrl.js
+++ b/Apollo/assets/js/controllers/certificateStatusCtrl.js
@@ -52,6 +52,8 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
// }
// }
+
+
if (localDetail != null) {
if (localDetails.localType === 'R004') {
$scope.localTypeSuperAdmin = true;
@@ -152,6 +154,14 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
};
$scope.getUniveId = function (univ) {
+
+ alert('in')
+
+ $scope.Currentdate = new Date();
+
+ console.log($scope.Currentdate);
+
+
let name = JSON.parse(univ);
$scope.searchData.University = name.UniversityID;
$scope.searchData.Course = '';
@@ -249,6 +259,8 @@ app.controller('certificateStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
// Select one row in a table once
$scope.setOneSelect = function (value) {
+
+ // alert('inset')
// alert(JSON.stringify(value));
angular.forEach($scope.searchResultDetails, function (item) {
item.Selected = false;
diff --git a/Apollo/assets/js/controllers/markcardStatusCtrl.js b/Apollo/assets/js/controllers/markcardStatusCtrl.js
index 531e9989..15382308 100644
--- a/Apollo/assets/js/controllers/markcardStatusCtrl.js
+++ b/Apollo/assets/js/controllers/markcardStatusCtrl.js
@@ -143,6 +143,11 @@ app.controller('markcardStatusCtrl', ["$scope", "toaster", "$filter", "ngTablePa
};
$scope.getUniveId = function (univ) {
+
+alert();
+ $scope.Currentdate = new Date();
+
+ console.log($scope.Currentdate);
let name = JSON.parse(univ);
$scope.searchData.University = name.UniversityID;
$scope.searchData.Course = '';
diff --git a/Apollo/assets/js/controllers/report_app_pendingCtrl.js b/Apollo/assets/js/controllers/report_app_pendingCtrl.js
index 36f4087f..e6d27905 100755
--- a/Apollo/assets/js/controllers/report_app_pendingCtrl.js
+++ b/Apollo/assets/js/controllers/report_app_pendingCtrl.js
@@ -148,6 +148,9 @@ $scope.generateButtonStatus = false;
if (response.data.app_pendingList == true) {
$scope.isLoaderShow1 =false;
$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++)
$scope.app_pending_data[i].SL_NO = i+1;
diff --git a/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js b/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js
index 4dca3eed..70c98671 100755
--- a/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js
+++ b/Apollo/assets/js/controllers/studyMaterialStatusCtrl.js
@@ -329,6 +329,9 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
}
$scope.maxDateForStatusUpdt = '';
+
+ $scope.Currentdate= new Date();
+
$scope.statusCheck = function(sts){
let stas = JSON.parse(sts);
$scope.myStatusModel.staus = stas.ListCode;
@@ -493,7 +496,11 @@ app.controller('studentModalDemoCtrl', ["$scope", "$modal", "$log", "API_POINTS"
$scope.open = function (studentDetails) {
+
+ $scope.Currentdate = new Date();
+
+ console.log($scope.Currentdate);
// get student view details
var getcourse = {
method: 'POST',
diff --git a/Apollo/assets/views/status-update/answer_booklet_status.html b/Apollo/assets/views/status-update/answer_booklet_status.html
index 58deac30..9fadbc11 100755
--- a/Apollo/assets/views/status-update/answer_booklet_status.html
+++ b/Apollo/assets/views/status-update/answer_booklet_status.html
@@ -288,7 +288,10 @@
Date is required.
@@ -393,6 +396,7 @@
is-open="startOpen" ng-init="startOpen = false" name="dateofstaus"
datepicker-options="dateOptions" placeholder="Select Date " close-text="Close"
required="required" ng-change="getMaxEndDate(myModel.startDate)"
+ min-date="Currentdate" max-date="Currentdate"
/>
Date is required.
Enter a Valid Date
diff --git a/Apollo/assets/views/status-update/application_status.html b/Apollo/assets/views/status-update/application_status.html
index 17c7b84e..fca1319b 100644
--- a/Apollo/assets/views/status-update/application_status.html
+++ b/Apollo/assets/views/status-update/application_status.html
@@ -288,6 +288,8 @@
datepicker-options="dateOptions" placeholder="Select Date " close-text="Close"
max-date="minDate"
required="required" ng-change="getMaxEndDate(myModel.startDate)"
+
+ min-date="Currentdate" max-date="Currentdate"
/>
Date is required.
@@ -485,6 +487,7 @@
datepicker-options="dateOptions" placeholder="Select Date " close-text="Close"
max-date="minDate"
required="required" ng-change="getMaxEndDate(myModel.startDate)"
+ min-date="Currentdate" max-date="Currentdate"
/>
Date is required.
diff --git a/Apollo/assets/views/status-update/certificate_status.html b/Apollo/assets/views/status-update/certificate_status.html
index 955a56ef..6efdc468 100644
--- a/Apollo/assets/views/status-update/certificate_status.html
+++ b/Apollo/assets/views/status-update/certificate_status.html
@@ -286,6 +286,7 @@
is-open="startOpen" ng-init="startOpen = false" name="dateofstaus"
datepicker-options="dateOptions" placeholder="Select Date " close-text="Close"
required="required" ng-change="getMaxEndDate(myModel.startDate)"
+ min-date="Currentdate" max-date="Currentdate"
/>
Date is required.
Enter a Valid Date
@@ -397,6 +398,7 @@
is-open="startOpen" ng-init="startOpen = false" name="dateofstaus"
datepicker-options="dateOptions" placeholder="Select Date " close-text="Close"
required="required" ng-change="getMaxEndDate(myModel.startDate)"
+ min-date="Currentdate" max-date="Currentdate"
/>
Date is required.
diff --git a/Apollo/assets/views/status-update/markcard_status.html b/Apollo/assets/views/status-update/markcard_status.html
index 894db4c4..1f78401d 100644
--- a/Apollo/assets/views/status-update/markcard_status.html
+++ b/Apollo/assets/views/status-update/markcard_status.html
@@ -303,6 +303,7 @@
is-open="startOpen" ng-init="startOpen = false" name="dateofstaus"
datepicker-options="dateOptions" placeholder="Select Date " close-text="Close"
required="required" ng-change="getMaxEndDate(myModel.startDate)"
+ min-date="Currentdate" max-date="Currentdate"
/>
Date is required.
@@ -420,6 +421,7 @@
is-open="startOpen" ng-init="startOpen = false" name="dateofstaus"
datepicker-options="dateOptions" placeholder="Select Date " close-text="Close"
required="required" ng-change="getMaxEndDate(myModel.startDate)"
+ min-date="Currentdate" max-date="Currentdate"
/>
Date is required.
Enter a Valid Date
diff --git a/Apollo/assets/views/status-update/study_material_status.html b/Apollo/assets/views/status-update/study_material_status.html
index 11a1bcb9..e55b9c1a 100755
--- a/Apollo/assets/views/status-update/study_material_status.html
+++ b/Apollo/assets/views/status-update/study_material_status.html
@@ -352,7 +352,7 @@