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

bugs resolved, status screen branch select access for super admin: kdk

Browse Source
This commit is contained in:
resicovenba 2018-01-18 11:06:46 +05:30
parent 857771388b
commit 8de1eb6702
16 changed files with 671 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Apollo/api/application/controllers/Employee_Controller.php
View File

@ -331,8 +331,8 @@ class Employee_Controller extends REST_Controller {
$req['OtherID'] = $data['OtherID'];
$req['OtherIDDetails'] = $data['OtherIDDetails'];
$req['Qualification'] = $data['Qualification'];
$req['JobResponsibility'] = $data['JobResponsibility'];
// $req['ProfilePicPath'] = $data['ProfilePicPath'];
// $req['JobResponsibility'] = $data['JobResponsibility'];
$req['ProfilePicPath'] = $data['ProfilePicPath'];
// $req['BranchCode'] = $data['BranchCode'];
$req['IsActive'] = $data['IsActive'];
// $req['DOJ'] = date('d-m-Y', strtotime($data['DOJ']) );
@ -385,8 +385,8 @@ class Employee_Controller extends REST_Controller {
$req['OtherID'] = $data['OtherID'];
$req['OtherIDDetails'] = $data['OtherIDDetails'];
$req['Qualification'] = $data['Qualification'];
$req['ProfilePicPath'] = $data['ProfilePicPath'];
$req['JobResponsibility'] = $data['JobResponsibility'];
// $req['ProfilePicPath'] = $data['ProfilePicPath'];
// $req['JobResponsibility'] = $data['JobResponsibility'];
// $req['BranchCode'] = $data['BranchCode'];
$req['IsActive'] = $data['IsActive'];
// $req['DOJ'] = date('d-m-Y', strtotime($data['DOJ']) );

8
Apollo/assets/js/config.router.js
View File

@ -3,8 +3,8 @@
/**
* Config for the router
*/
app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$compileProvider', '$filterProvider', '$provide', '$ocLazyLoadProvider', 'JS_REQUIRES',
function ($stateProvider, $urlRouterProvider, $controllerProvider, $compileProvider, $filterProvider, $provide, $ocLazyLoadProvider, jsRequires) {
app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$compileProvider', '$filterProvider', '$provide', '$ocLazyLoadProvider', 'JS_REQUIRES', '$locationProvider',
function ($stateProvider, $urlRouterProvider, $controllerProvider, $compileProvider, $filterProvider, $provide, $ocLazyLoadProvider, jsRequires, $locationProvider) {
app.controller = $controllerProvider.register;
app.directive = $compileProvider.directive;
@ -13,6 +13,8 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
app.service = $provide.service;
app.constant = $provide.constant;
app.value = $provide.value;
// LAZY MODULES
@ -462,7 +464,7 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com
templateUrl: "assets/views/utility_500.html",
});
// $locationProvider.html5Mode(true);
// Generates a resolve object previously configured in constant.JS_REQUIRES (config.constant.js)
function loadSequence() {

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

@ -74,7 +74,8 @@ app.controller("activityCtrl", ["$scope", "toaster", "$filter", "API_POINTS", "$
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
} else {
$scope.ldloading = {};
if(myModel.status.length > 0) {
$scope.ldloading = {};
$scope.ldloading[loading.replace('-', '_')] = true;
@ -106,6 +107,11 @@ app.controller("activityCtrl", ["$scope", "toaster", "$filter", "API_POINTS", "$
}
});
} else {
swal("Warning!", "Status are required", "warning");
$scope.companies.status = "";
}
}
}

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

@ -296,8 +296,8 @@ app.controller('answerBookletStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
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 {
localDetails.localBranchID = localBranchDetails;
localDetail.localBranchID = localBranchDetails;
localDetails.localBranchID = localBranchDetails !== '' ? localBranchDetails : localDetails.localBranchID ;
localDetail.localBranchID = localBranchDetails !== '' ? localBranchDetails : localDetail.localBranchID ;
$scope.disableButton = true;
var studentForUpdate = [];
let formate = "dd-MM-yyyy";

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

@ -28,6 +28,8 @@ app.controller('applicationStatusCtrl', ["$scope", "toaster", "$filter", "ngTabl
var localDetails = ipCookie('cookiechk');
const localUpdateStatus = 'APPICATION_STATUS';
$scope.localTypeSuperAdmin = false;
$scope.localBranchDetails = '';
$scope.init = function () {
@ -324,8 +326,11 @@ app.controller('applicationStatusCtrl', ["$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 {
localDetails.localBranchID = localBranchDetails;
localDetail.localBranchID = localBranchDetails;
// alert(localDetail.localBranchID);
// alert(localBranchDetails);
localDetails.localBranchID = localBranchDetails !== '' ? localBranchDetails : localDetails.localBranchID ;
localDetail.localBranchID = localBranchDetails !== '' ? localBranchDetails : localDetail.localBranchID ;
// alert(localDetail.localBranchID);
$scope.disableButton = true;
var studentForUpdate = [];
let formate = "dd-MM-yyyy";

6
Apollo/assets/js/controllers/certificationStatusCtrl.js
View File

@ -331,9 +331,9 @@ app.controller('certificationStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
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 {
localDetails.localBranchID = localBranchDetails;
localDetail.localBranchID = localBranchDetails;
$scope.disableButton = true;
localDetails.localBranchID = localBranchDetails !== '' ? localBranchDetails : localDetails.localBranchID ;
localDetail.localBranchID = localBranchDetails !== '' ? localBranchDetails : localDetail.localBranchID ;
$scope.disableButton = true;
var studentForUpdate = [];
let formate = "dd-MM-yyyy";
$scope.myStatusModel.dateOn = $filter('date')(new Date($scope.myStatusModel.dateOn), formate);

23
Apollo/assets/js/controllers/employeeCtrl.js
View File

@ -132,6 +132,29 @@ app.controller('staffCtrl', ["$scope", "toaster", "$filter", "ngTableParams", "$
$scope.editId = id;
$scope.editBranchId = -1;
}
$scope.getEditDetails = function(p) {
$scope.myModelEdit = {
"StaffID": p.StaffID,
"Firstname": p.Firstname,
"Lastname": p.Lastname,
"Fathername": p.Fathername,
"MotherName": p.MotherName,
"EmailID": p.EmailID,
"MobileNumber": p.MobileNumber,
"AlternateNumber": p.AlternateNumber,
"DOB": p.DOB,
"Gender": p.Gender,
"Qualification":p.Qualification,
"AadharNumber": p.AadharNumber,
"OtherID": p.OtherID,
"OtherIDDetails": p.OtherIDDetails,
"PermanentAddress": p.PermanentAddress,
"PresentAddress": p.PresentAddress,
"DOJ": p.DOJ,
"IsActive": p.IsActive,
"ProfilePicPath": p.ProfilePicPath
}
}
$scope.setEditBranchId = function (id) {
$scope.getEmpBranchDetails(id);

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

@ -306,8 +306,8 @@ app.controller('studyMaterialStatusCtrl', ["$scope", "toaster", "$filter", "ngTa
// swal("The form cannot be submitted because it contains validation errors!", "Errors are marked with a red, dashed border!", "error");
} else {
// alert(localBranchDetails);
localDetails.localBranchID = localBranchDetails;
localDetail.localBranchID = localBranchDetails;
localDetails.localBranchID = localBranchDetails !== '' ? localBranchDetails : localDetails.localBranchID ;
localDetail.localBranchID = localBranchDetails !== '' ? localBranchDetails : localDetail.localBranchID ;
// alert(localDetails.localBranchID);
$scope.disableButton = true;
var studentForUpdate = [];

5
Apollo/assets/js/main.js
View File

@ -67,6 +67,11 @@ function (cfpLoadingBarProvider) {
cfpLoadingBarProvider.includeSpinner = false;
}]);
// app.config(['$locationProvider',
// function ($locationProvider) {
// $locationProvider.html5Mode(true);
// }]);
// app.controller('sessionCtrl', ["$scope", "$localStorage", "$state", function ($scope, $localStorage, $state) {
// /**
// * checking the session settings and logout for the function

48
Apollo/assets/views/editEmployeeDetails.html
View File

@ -158,7 +158,7 @@
Employee ID <span class="symbol required"></span>
</label>
<input type="text" placeholder="Enter Employee Id" tabindex="1" class="form-control" name="employeeId" ng-model="p.StaffID"
<input type="text" placeholder="Enter Employee Id" tabindex="1" class="form-control" name="employeeId" ng-model="myModelEdit.StaffID"
ng-pattern="/^[a-zA-Z0-9.\s]*$/" ng-blur='checkEmpIdExist()' readonly required/>
<span class="error text-small block" ng-if="Form.employeeId.$dirty && Form.employeeId.$error.required">Employee Id required</span>
<span class="error text-small block" ng-if="Form.employeeId.$dirty && Form.employeeId.$error.pattern">Invalid Employee Id </span>
@ -170,7 +170,7 @@
First Name <span class="symbol required"></span>
</label>
<input type="text" placeholder="Enter First Name" tabindex="2" class="form-control" name="firstname" ng-model="p.Firstname"
<input type="text" placeholder="Enter First Name" tabindex="2" class="form-control" name="firstname" ng-model="myModelEdit.Firstname"
ng-pattern="/^[a-zA-Z0-9.\s]*$/" required/>
<span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.required">First Name required</span>
<span class="error text-small block" ng-if="Form.firstname.$dirty && Form.firstname.$error.pattern">Invalid First Name </span>
@ -181,7 +181,7 @@
Last Name <span class="symbol required"></span>
</label>
<input type="text" placeholder="Enter Last Name" tabindex="3" class="form-control" name="lastname" ng-model="p.Lastname"
<input type="text" placeholder="Enter Last Name" tabindex="3" class="form-control" name="lastname" ng-model="myModelEdit.Lastname"
ng-pattern="/^[a-zA-Z0-9.\s]*$/" required/>
<span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.required">Last Name required</span>
<span class="error text-small block" ng-if="Form.lastname.$dirty && Form.lastname.$error.pattern">Invalid Last Name </span>
@ -193,7 +193,7 @@
Father Name
</label>
<input type="text" placeholder="Enter Father Name" tabindex="4" class="form-control" name="fathername" ng-model="p.Fathername"
<input type="text" placeholder="Enter Father Name" tabindex="4" class="form-control" name="fathername" ng-model="myModelEdit.Fathername"
ng-pattern="/^[a-zA-Z.\s]*$/" />
<span class="error text-small block" ng-if="Form.fathername.$dirty && Form.fathername.$error.pattern">Invalid Father Name </span>
</div>
@ -203,7 +203,7 @@
Mother Name
</label>
<input type="text" placeholder="Enter Mother Name" tabindex="5" class="form-control" name="mothername" ng-model="p.MotherName"
<input type="text" placeholder="Enter Mother Name" tabindex="5" class="form-control" name="mothername" ng-model="myModelEdit.MotherName"
ng-pattern="/^[a-zA-Z0-9.\s]*$/" />
<span class="error text-small block" ng-if="Form.mothername.$dirty && Form.mothername.$error.pattern">Invalid Last Name </span>
</div>
@ -212,7 +212,7 @@
Email ID <span class="symbol required"></span>
</label>
<input type="email" tabindex="6" placeholder="Enter Email ID" class="form-control" name="emailId" ng-pattern="/^[-a-z0-9~!$%^&*_=+}{\'?]+(\.[-a-z0-9~!$%^&*_=+}{\'?]+)*@([a-z0-9_][-a-z0-9_]*(\.[-a-z0-9_]+)*\.(aero|arpa|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org|pro|travel|mobi|[a-z][a-z])|([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}))(:[0-9]{1,5})?$/i"
ng-model="p.EmailID" ng-blur='updateCheckEmailExist(p)' required>
ng-model="myModelEdit.EmailID" ng-blur='updateCheckEmailExist(p)' required>
<span class="error text-small block" ng-if="Form.emailId.$dirty && Form.primaryEmail.$invalid" ng-hide="Form.emailId.$error.email">Email is required.</span>
<span class="error text-small block" ng-if="Form.emailId.$error.email">Please, enter a valid email address.</span>
</div>
@ -224,7 +224,7 @@
Mobile Number <span
class="symbol required"></span>
</label>
<input type="text" name="primaryPhone" tabindex="7" placeholder="Enter Mobile Number" class="form-control" ng-model="p.MobileNumber"
<input type="text" name="primaryPhone" tabindex="7" placeholder="Enter Mobile Number" class="form-control" ng-model="myModelEdit.MobileNumber"
ng-minlength="10" ng-maxlength="12" ng-pattern="/^[0-9]*$/" ng-blur='updateCheckMobileExist(p)'
required/>
<span class="error text-small block" ng-if="Form.primaryPhone.$dirty && Form.primaryPhone.$invalid" ng-hide="Form.primaryPhone.$error.maxlength || Form.primaryPhone.$error.minlength || Form.primaryPhone.$error.pattern">Mobile Number is required.</span>
@ -234,7 +234,7 @@
<label class="control-label">
Alternate Mobile Number
</label>
<input type="text" name="secondaryPhone" tabindex="8" placeholder="Enter Alternate Mobile Number" class="form-control" ng-model="p.AlternateNumber"
<input type="text" name="secondaryPhone" tabindex="8" placeholder="Enter Alternate Mobile Number" class="form-control" ng-model="myModelEdit.AlternateNumber"
ng-minlength="10" ng-maxlength="12" ng-pattern="/^[0-9]*$/" />
<span class="error text-small block" ng-if="Form.secondaryPhone.$error.maxlength || Form.secondaryPhone.$error.minlength || Form.secondaryPhone.$error.pattern">Enter a Valid Phone Number</span>
</div>
@ -248,7 +248,7 @@
class="symbol required"></span>
</label>
<input type="text" tabindex="9" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="p.DOB"
<input type="text" tabindex="9" class="form-control " ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModelEdit.DOB"
is-open="startOpen" ng-init="startOpen = false" name="dateofbirth" datepicker-options="dateOptions"
placeholder="Select Date of Birth" close-text="Close" required="required" ng-change="getMaxEndDate(myModel.startDate)"
max-date="currentDate" />
@ -266,11 +266,11 @@
Gender <span class="symbol required"></span>
</label>
<div class="clip-radio radio-primary">
<input type="radio" id="female" name="gender" value="female" ng-model="p.Gender" required>
<input type="radio" id="female" name="gender" value="female" ng-model="myModelEdit.Gender" required>
<label for="female">
Female
</label>
<input type="radio" id="male" name="gender" value="male" ng-model="p.Gender" required>
<input type="radio" id="male" name="gender" value="male" ng-model="myModelEdit.Gender" required>
<label for="male">
Male
</label>
@ -283,7 +283,7 @@
Qualification
</label>
<input type="text" placeholder="Enter Qualification" tabindex="11" class="form-control" name="qualificaion" ng-model="p.Qualification"
<input type="text" placeholder="Enter Qualification" tabindex="11" class="form-control" name="qualificaion" ng-model="myModelEdit.Qualification"
ng-pattern="/^[a-zA-Z.\s]*$/" />
<span class="error text-small block" ng-if="Form.qualificaion.$dirty && Form.qualificaion.$error.pattern">Enter a Valid Qualification</span>
</div>
@ -295,7 +295,7 @@
<!--<input type="text" class="form-control" name="masked" placeholder="99/99/9999" ui-mask="99/99/9999" ng-model="x">-->
<input type="text" name="aadharNumber" tabindex="12" placeholder="____-____-____" ui-mask="9999-9999-9999" class="form-control"
ng-model="p.AadharNumber" ng-minlength="10" ng-maxlength="15" ng-pattern="/^[0-9]*$/" required>
ng-model="myModelEdit.AadharNumber" ng-minlength="10" ng-maxlength="15" ng-pattern="/^[0-9]*$/" required>
<span class="error text-small block" ng-if="Form.aadharNumber.$dirty && Form.aadharNumber.$invalid" ng-hide="Form.aadharNumber.$error.maxlength || Form.aadharNumber.$error.minlength || Form.aadharNumber.$error.pattern">Aadhar Number is required.</span>
<span class="error text-small block" ng-if="Form.aadharNumber.$error.maxlength || Form.aadharNumber.$error.minlength || Form.aadharNumber.$error.pattern">Enter a Valid Aadhar Number</span>
</div>
@ -308,7 +308,7 @@
<label>
Other ID
</label>
<input type="text" name="otherId" tabindex="13" placeholder="Other Id" class="form-control" ng-model="p.OtherID" ng-minlength="1"
<input type="text" name="otherId" tabindex="13" placeholder="Other Id" class="form-control" ng-model="myModelEdit.OtherID" ng-minlength="1"
ng-maxlength="20" ng-pattern="/^[a-zA-Z0-9 ._-]+$/">
<span class="error text-small block" ng-if="Form.otherId.$dirty && Form.otherId.$invalid" ng-hide="Form.otherId.$error.maxlength || Form.otherId.$error.minlength || Form.otherId.$error.pattern">Aadhar Number is required.</span>
<span class="error text-small block" ng-if="Form.otherId.$error.maxlength || Form.otherId.$error.minlength || Form.otherId.$error.pattern">Enter a Valid Details</span>
@ -317,7 +317,7 @@
<label>
Other ID Details
</label>
<input type="text" name="otherIdDetails" tabindex="14" placeholder="Other Id Details" class="form-control" ng-model="p.OtherIDDetails"
<input type="text" name="otherIdDetails" tabindex="14" placeholder="Other Id Details" class="form-control" ng-model="myModelEdit.OtherIDDetails"
ng-minlength="1" ng-maxlength="20" ng-pattern="/^[a-zA-Z0-9 ._-]+$/">
<span class="error text-small block" ng-if="Form.otherIdDetails.$dirty && Form.otherIdDetails.$invalid" ng-hide="Form.otherIdDetails.$error.maxlength || Form.otherIdDetails.$error.minlength || Form.otherIdDetails.$error.pattern">Aadhar Number is required.</span>
<span class="error text-small block" ng-if="Form.otherIdDetails.$error.maxlength || Form.otherIdDetails.$error.minlength || Form.otherIdDetails.$error.pattern">Enter a Valid Details</span>
@ -328,14 +328,14 @@
<label>
Permanent Address
</label>
<textarea placeholder="Enter Permanent Address" tabindex="15" class="form-control textdsc" name="address1" ng-model="p.PermanentAddress"></textarea>
<textarea placeholder="Enter Permanent Address" tabindex="15" class="form-control textdsc" name="address1" ng-model="myModelEdit.PermanentAddress"></textarea>
<span class="error text-small block" ng-if="Form.address1.$dirty && Form.address1.$invalid">Permanent Address is required</span>
</div>
<div class="col-md-4 form-group" ng-class="{'has-error':Form.address2.$dirty && Form.address2.$invalid}">
<label>
Current Address
</label>
<textarea placeholder="Enter Current Address" tabindex="16" class="form-control textdsc" name="address2" ng-model="p.PresentAddress"></textarea>
<textarea placeholder="Enter Current Address" tabindex="16" class="form-control textdsc" name="address2" ng-model="myModelEdit.PresentAddress"></textarea>
<span class="error text-small block" ng-if="Form.address2.$dirty && Form.address2.$invalid">Current Address is required</span>
</div>
</div>
@ -346,7 +346,7 @@
Date Of Joining <span class="symbol required"></span>
</label>
<input type="text" tabindex="17" class="form-control" ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="p.DOJ"
<input type="text" tabindex="17" class="form-control" ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModelEdit.DOJ"
is-open="startOpen" ng-init="startOpen = false" name="dateofjoining" datepicker-options="dateOptions"
placeholder="Select Date of Birth" close-text="Close" required="required" ng-change="getMaxEndDate(myModel.startDate)"
/>
@ -377,18 +377,18 @@
</div>-->
<div ng-if="p.IsActive==true">
<switch ng-model="p.IsActive" ng-init="p.IsActive = true" class="green"></switch>
<div ng-if="myModelEdit.IsActive==true">
<switch ng-model="myModelEdit.IsActive" ng-init="myModelEdit.IsActive = true" class="green"></switch>
</div>
<div ng-if="p.IsActive==false">
<switch ng-model="p.IsActive" ng-init="p.IsActive = false" class="green"></switch>
<div ng-if="myModelEdit.IsActive==false">
<switch ng-model="myModelEdit.IsActive" ng-init="myModelEdit.IsActive = false" class="green"></switch>
</div>
<!--<div ng-switch-default>
<switch ng-model="p.IsActive" ng-init="p.IsActive = true" class="green"></switch>
</div>-->
</div>
<div class="col-md-2">
<img class="thumb prof" ng-src="images/{{p.ProfilePicPath}}" />
<img class="thumb prof" ng-src="images/{{myModelEdit.ProfilePicPath}}" />
<style>
.thumb {
width: 130px;
@ -473,7 +473,7 @@
<div class="row">
<div class="col-md-12">
<div class="pull-right">
<button type="button" ladda="ldloading1.zoom_in" tabindex="19" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="updateEmpDetails(Form, p, hidden_DOB, hidden_DOJ)">
<button type="button" ladda="ldloading1.zoom_in" tabindex="19" class="btn btn-wide btn-success" data-style="zoom-in" ng-click="updateEmpDetails(Form, myModelEdit, hidden_DOB, hidden_DOJ)">
Save
</button>
<button type="reset" class="btn btn-warning btn-wide" tabindex="20" ng-click="cancel()">

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

@ -113,7 +113,7 @@
<td><span ng-if="p.IsActive == 1"> Active </span><span ng-if="p.IsActive == 0">De-Active</span></td>
<td style="text-align: center;">
<input type=button class="btn btn-info btn-xs" ladda="ldloading1.zoom_in" id="editRowBtn{{p.StaffID}}" value="Personal Details"
ng-click="setEditId(p.StaffID);">
ng-click="setEditId(p.StaffID);getEditDetails(p);">
<input type=button class="btn btn-blue btn-xs" id="editBranchRowBtn{{p.StaffID}}" value="Branch Details" ng-click="setEditBranchId(p.StaffID);">
</td>
</tr>

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

@ -222,7 +222,7 @@
right: 0;
}
</style>
<form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel, localBranchDetails)" method="post">
<div ng-if="!localTypeSuperAdmin"><form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel, localBranchDetails)" method="post">
<div class="container">
<div class="row">
<div class="col-md-2">
@ -304,7 +304,111 @@
/>
<span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span>
</div>
<div class="col-md-6 form-group" ng-class="{'has-error':Form.branch.$dirty && Form.branch.$invalid, 'has-success':Form.branch.$valid}">
</div>
<div class="row">
<div class="col-md-12">
<div class="pull-right">
<button type="submit" ng-disabled="disableButton" tabindex="8" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success" data-style="zoom-in">
<i class="fa fa-circle-o-notch fa-spin" ng-if="disableButton" style="font-size:14px"></i> Submit
</button>
<button type="reset" tabindex="9" class="btn btn-warning btn-wide" tabindex="9" ng-click="employeeForm.resetCourse(Form)">
Reset
</button>
</div>
</div>
</div>
</fieldset>
</div>
<div class="col-md-2">
</div>
</div>
</div>
</form></div>
<div ng-if="localTypeSuperAdmin"><form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel, localBranchDetails)" method="post">
<div class="container">
<div class="row">
<div class="col-md-2">
</div>
<div class="col-md-8">
<fieldset style="background-color: #eaeaea;">
<legend>
Update Status
</legend>
<div>
<a id="cancel_button" ng-click="unSelect()" tooltip="Close">
<span class="glyphicon glyphicon-remove-circle"></span>
</a>
</div>
<div class="row">
<div class="col-md-4 form-group" ng-class="{'has-error':Form.semYear.$dirty && Form.semYear.$invalid, 'has-success':Form.semYear.$valid}">
<label for="form-field-select-2">
Sem/Year <span class="symbol required"></span>
</label>
<select class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="semYear" ng-model="myStatusModel.semYear"
required>
<option value="" disabled selected>Select Sem/Year</option>
<option ng-repeat="itemSemY in semYearList" value="{{itemSemY.ID}}">{{itemSemY.Sem_Year}}</option>
</select>
<span class="error text-small block" ng-if="Form.semYear.$dirty && Form.semYear.$error.required">Sem/Year is Required</span>
</div>
<div class="col-md-4 form-group" ng-class="{'has-error':Form.status.$dirty && Form.status.$invalid, 'has-success':Form.status.$valid}">
<label for="form-field-select-2">
Status <span class="symbol required"></span>
</label>
<select class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="status" ng-model="myStatusModel.staus"
required>
<option value="" disabled selected>Select Status</option>
<option ng-repeat="itemStatus in statusDetailsList" value="{{itemStatus.ListCode}}">{{itemStatus.ListName}}</option>
</select>
<span class="error text-small block" ng-if="Form.status.$dirty && Form.status.$error.required">Status is Required</span>
</div>
<!--<div class="col-md-4 form-group" ng-class="{'has-error':Form.status.$dirty && Form.status.$invalid , 'has-success':Form.status.$valid}">
<label>
Status <span
class="symbol required"></span>
</label>
<input type="text" name="status" tabindex="5" placeholder="Enter Status" class="form-control" ng-model="myStatusModel.staus"
required/>
<span class="error text-small block" ng-if="Form.sestatusmYear.$dirty && Form.status.$error.required">Status is Required </span>
</div>-->
<div data-ng-controller="DatepickerDemoCtrl">
<div class="col-md-4 form-group" ng-class="{'has-error':Form.dateofstaus.$dirty && Form.dateofstaus.$invalid, 'has-success':Form.dateofstaus.$valid}">
<label>
Date <span
class="symbol required"></span>
</label>
<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"
datepicker-options="dateOptions" placeholder="Select Date " close-text="Close"
required="required" ng-change="getMaxEndDate(myModel.startDate)"
/>
<!--<input type="text" tabindex="28" class="form-control" ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModelCourseAdd.dateofjoining"
is-open="startOpen" ng-init="startOpen = false" name="dateofjoining" datepicker-options="dateOptions"
placeholder="Select Date of Joining" close-text="Close" required="required" datepicker-position="top"
/>-->
<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>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6 form-group" ng-class="{'has-error':Form.description.$dirty && Form.description.$invalid}">
<label>
Comments
</label>
<textarea type="text" placeholder="Enter Comments" tabindex="7" class="form-control" name="description" ng-model="myStatusModel.comment"
/>
<span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span>
</div>
<div class="col-md-6 form-group" ng-class="{'has-error':Form.branch.$dirty && Form.branch.$invalid, 'has-success':Form.branch.$valid}" >
<label for="form-field-select-2">
Select Branch <span
class="symbol required"></span>
@ -337,7 +441,8 @@
</div>
</div>
</div>
</form>
</form></div>
</div>
</div>
<!--studen search result end-->

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

@ -211,7 +211,7 @@
</div>
<div ng-if="OpenWindowStatus">
<form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel , localBranchDetails)" method="post">
<div ng-if="!localTypeSuperAdmin"><form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel , localBranchDetails)" method="post">
<style>
#cancel_button {
/*line-height: 12px;
@ -334,7 +334,154 @@
/>
<span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span>
</div>
<div class="col-md-6 form-group" ng-class="{'has-error':Form.branch.$dirty && Form.branch.$invalid, 'has-success':Form.branch.$valid}">
</div>
<div class="row">
<div class="col-md-12">
<div class="pull-right">
<button type="submit" ng-disabled="disableButton" tabindex="8" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success"
data-style="zoom-in">
<i class="fa fa-circle-o-notch fa-spin" ng-if="disableButton" style="font-size:14px"></i> Submit
</button>
<button type="reset" tabindex="9" class="btn btn-warning btn-wide" tabindex="9" ng-click="employeeForm.resetCourse(Form)">
Reset
</button>
</div>
</div>
</div>
</fieldset>
</div>
<div class="col-md-3">
</div>
</div>
</div>
</form></div>
<div ng-if="localTypeSuperAdmin"><form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel , localBranchDetails)" method="post">
<style>
#cancel_button {
/*line-height: 12px;
width: 18px;
font-size: 8pt;
font-family: tahoma;*/
margin-top: 1px;
margin-right: 2px;
position: absolute;
top: 0;
right: 0;
}
</style>
<div class="container">
<div class="row">
<div class="col-md-3">
</div>
<div class="col-md-6">
<fieldset style="background-color: #eaeaea;">
<legend>
Update Status
</legend>
<div>
<!--<input id="cancel_button" type="button" value="X">-->
<!--<span id="cancel_button" class="btn btn-success btn-lg">
<i class="glyphicon glyphicon-remove-circle"></i>
</span>-->
<a id="cancel_button" ng-click="unSelect()" tooltip="Close">
<span class="glyphicon glyphicon-remove-circle"></span>
</a>
</div>
<div class="row">
<div class="col-md-6 form-group" ng-class="{'has-error':Form.certificatetype.$dirty && Form.certificatetype.$invalid, 'has-success':Form.certificatetype.$valid}">
<label for="form-field-select-2">
Document Type <span class="symbol required"></span>
</label>
<select class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="certificatetype" ng-model="myStatusModel.certificatetype"
required>
<option value="" disabled selected>Select Document Type</option>
<option ng-repeat="itemCerf in certificateData" value="{{itemCerf.CertificationID}}">{{itemCerf.CertificateName}}</option>
</select>
<span class="error text-small block" ng-if="Form.certificatetype.$dirty && Form.certificatetype.$error.required">Document Type is Required</span>
</div>
<div class="col-md-6 form-group" ng-class="{'has-error':Form.certificateNumber.$dirty && Form.certificateNumber.$invalid }">
<label>
Document Number
</label>
<input type="text" name="certificateNumber" tabindex="5" placeholder="Enter Document Number" class="form-control" ng-model="myStatusModel.certificateNumber"
/>
<span class="error text-small block" ng-if="Form.certificateNumber.$dirty && Form.certificateNumber.$error.required">Document Number is Required </span>
</div>
</div>
<div class="row">
<!--<div class="col-md-4 form-group" ng-class="{'has-error':Form.semYear.$dirty && Form.semYear.$invalid, 'has-success':Form.semYear.$valid}">
<label for="form-field-select-2">
Sem/Year <span class="symbol required"></span>
</label>
<select class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="semYear" ng-model="myStatusModel.semYear"
required>
<option value="" disabled selected>Select Sem/Year</option>
<option ng-repeat="itemSemY in semYearList" value="{{itemSemY.ID}}">{{itemSemY.Sem_Year}}</option>
</select>
<span class="error text-small block" ng-if="Form.semYear.$dirty && Form.semYear.$error.required">Sem/Year is Required</span>
</div>-->
<div class="col-md-6 form-group" ng-class="{'has-error':Form.status.$dirty && Form.status.$invalid, 'has-success':Form.status.$valid}">
<label for="form-field-select-2">
Status <span class="symbol required"></span>
</label>
<select class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="status" ng-model="myStatusModel.staus"
required>
<option value="" disabled selected>Select Status</option>
<option ng-repeat="itemStatus in statusDetailsList" value="{{itemStatus.ListCode}}">{{itemStatus.ListName}}</option>
</select>
<span class="error text-small block" ng-if="Form.status.$dirty && Form.status.$error.required">Status is Required</span>
</div>
<!--<div class="col-md-6 form-group" ng-class="{'has-error':Form.status.$dirty && Form.status.$invalid , 'has-success':Form.status.$valid}">
<label>
Status <span
class="symbol required"></span>
</label>
<input type="text" name="status" tabindex="5" placeholder="Enter Status" class="form-control" ng-model="myStatusModel.staus"
required/>
<span class="error text-small block" ng-if="Form.sestatusmYear.$dirty && Form.status.$error.required">Status is Required </span>
</div>-->
<div data-ng-controller="DatepickerDemoCtrl">
<div class="col-md-6 form-group" ng-class="{'has-error':Form.dateofstaus.$dirty && Form.dateofstaus.$invalid, 'has-success':Form.dateofstaus.$valid}">
<label>
Date <span
class="symbol required"></span>
</label>
<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"
datepicker-options="dateOptions" placeholder="Select Date " close-text="Close"
required="required" ng-change="getMaxEndDate(myModel.startDate)"
/>
<!--<input type="text" tabindex="28" class="form-control" ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModelCourseAdd.dateofjoining"
is-open="startOpen" ng-init="startOpen = false" name="dateofjoining" datepicker-options="dateOptions"
placeholder="Select Date of Joining" close-text="Close" required="required" datepicker-position="top"
/>-->
<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>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6 form-group" ng-class="{'has-error':Form.description.$dirty && Form.description.$invalid}">
<label>
Comments
</label>
<textarea type="text" placeholder="Enter Comments" tabindex="7" class="form-control" name="description" ng-model="myStatusModel.comment"
/>
<span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span>
</div>
<div class="col-md-6 form-group" ng-class="{'has-error':Form.branch.$dirty && Form.branch.$invalid, 'has-success':Form.branch.$valid}"
>
<label for="form-field-select-2">
Select Branch <span
class="symbol required"></span>
@ -368,7 +515,8 @@
</div>
</div>
</div>
</form>
</form></div>
</div>
</div>
<!--studen search result end-->

138
Apollo/assets/views/status-update/certification_status.html
View File

@ -225,7 +225,7 @@
right: 0;
}
</style>
<form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel, localBranchDetails)" method="post">
<div ng-if="!localTypeSuperAdmin"><form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel, localBranchDetails)" method="post">
<div class="container">
<div class="row">
<div class="col-md-2">
@ -333,7 +333,138 @@
/>
<span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span>
</div>
<div class="col-md-6 form-group" ng-class="{'has-error':Form.branch.$dirty && Form.branch.$invalid, 'has-success':Form.branch.$valid}">
</div>
<div class="row">
<div class="col-md-12">
<div class="pull-right">
<button type="submit" ng-disabled="disableButton" tabindex="8" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success" data-style="zoom-in">
<i class="fa fa-circle-o-notch fa-spin" ng-if="disableButton" style="font-size:14px"></i> Submit
</button>
<button type="reset" tabindex="9" class="btn btn-warning btn-wide" tabindex="9" ng-click="employeeForm.resetCourse(Form)">
Reset
</button>
</div>
</div>
</div>
</fieldset>
</div>
<div class="col-md-2">
</div>
</div>
</div>
</form></div>
<div ng-if="localTypeSuperAdmin"><form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel, localBranchDetails)" method="post">
<div class="container">
<div class="row">
<div class="col-md-2">
</div>
<div class="col-md-8">
<fieldset style="background-color: #eaeaea;">
<legend>
Update Status
</legend>
<div>
<a id="cancel_button" ng-click="unSelect()" tooltip="Close">
<span class="glyphicon glyphicon-remove-circle"></span>
</a>
</div>
<div class="row">
<!--<div class="col-md-6 form-group" ng-class="{'has-error':Form.certificatetype.$dirty && Form.certificatetype.$invalid, 'has-success':Form.certificatetype.$valid}">
<label for="form-field-select-2">
Certificate Type <span class="symbol required"></span>
</label>
<select class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="certificatetype" ng-model="myStatusModel.certificatetype"
required>
<option value="" disabled selected>Select Certificate Type</option>
<option ng-repeat="itemCerf in certificateData" value="{{itemCerf.CertificationID}}">{{itemCerf.CertificateName}}</option>
</select>
<span class="error text-small block" ng-if="Form.certificatetype.$dirty && Form.certificatetype.$error.required">Certificate Type is Required</span>
</div>-->
<div class="col-md-6 form-group" ng-class="{'has-error':Form.semYear.$dirty && Form.semYear.$invalid, 'has-success':Form.semYear.$valid}">
<label for="form-field-select-2">
Sem/Year <span class="symbol required"></span>
</label>
<select class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="semYear" ng-model="myStatusModel.semYear"
required>
<option value="" disabled selected>Select Sem/Year</option>
<option ng-repeat="itemSemY in semYearList" value="{{itemSemY.ID}}">{{itemSemY.Sem_Year}}</option>
</select>
<span class="error text-small block" ng-if="Form.semYear.$dirty && Form.semYear.$error.required">Sem/Year is Required</span>
</div>
<div class="col-md-6 form-group" ng-class="{'has-error':Form.certificateNumber.$dirty && Form.certificateNumber.$invalid }">
<label>
Mark Card Number
</label>
<input type="text" name="certificateNumber" tabindex="5" placeholder="Enter Mark Card Number" class="form-control" ng-model="myStatusModel.certificateNumber"
/>
<span class="error text-small block" ng-if="Form.certificateNumber.$dirty && Form.certificateNumber.$error.required">Number is Required </span>
</div>
</div>
<div class="row">
<div class="col-md-6 form-group" ng-class="{'has-error':Form.status.$dirty && Form.status.$invalid, 'has-success':Form.status.$valid}">
<label for="form-field-select-2">
Status <span class="symbol required"></span>
</label>
<select class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="status" ng-model="myStatusModel.staus"
required>
<option value="" disabled selected>Select Status</option>
<option ng-repeat="itemStatus in statusDetailsList" value="{{itemStatus.ListCode}}">{{itemStatus.ListName}}</option>
</select>
<span class="error text-small block" ng-if="Form.status.$dirty && Form.status.$error.required">Status is Required</span>
</div>
<!--<div class="col-md-4 form-group" ng-class="{'has-error':Form.status.$dirty && Form.status.$invalid , 'has-success':Form.status.$valid}">
<label>
Status <span
class="symbol required"></span>
</label>
<input type="text" name="status" tabindex="5" placeholder="Enter Status" class="form-control" ng-model="myStatusModel.staus"
required/>
<span class="error text-small block" ng-if="Form.sestatusmYear.$dirty && Form.status.$error.required">Status is Required </span>
</div>-->
<div data-ng-controller="DatepickerDemoCtrl">
<div class="col-md-6 form-group" ng-class="{'has-error':Form.dateofstaus.$dirty && Form.dateofstaus.$invalid, 'has-success':Form.dateofstaus.$valid}">
<label>
Date <span
class="symbol required"></span>
</label>
<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"
datepicker-options="dateOptions" placeholder="Select Date " close-text="Close"
required="required" ng-change="getMaxEndDate(myModel.startDate)"
/>
<!--<input type="text" tabindex="28" class="form-control" ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModelCourseAdd.dateofjoining"
is-open="startOpen" ng-init="startOpen = false" name="dateofjoining" datepicker-options="dateOptions"
placeholder="Select Date of Joining" close-text="Close" required="required" datepicker-position="top"
/>-->
<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>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6 form-group" ng-class="{'has-error':Form.description.$dirty && Form.description.$invalid}">
<label>
Comments
</label>
<textarea type="text" placeholder="Enter Comments" tabindex="7" class="form-control" name="description" ng-model="myStatusModel.comment"
/>
<span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span>
</div>
<div class="col-md-6 form-group" ng-class="{'has-error':Form.branch.$dirty && Form.branch.$invalid, 'has-success':Form.branch.$valid}"
>
<label for="form-field-select-2">
Select Branch <span
class="symbol required"></span>
@ -366,7 +497,8 @@
</div>
</div>
</div>
</form>
</form></div>
</div>
</div>
<!--studen search result end-->

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

@ -228,54 +228,55 @@
display: block;
}
</style>
<form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel, localBranchDetails)" method="post">
<div id="bottom1" class="container">
<div class="row">
<div class="col-md-2">
</div>
<div ng-if="!localTypeSuperAdmin">
<form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel, localBranchDetails)" method="post">
<div id="bottom1" class="container">
<div class="row">
<div class="col-md-2">
</div>
<div class="col-md-8">
<fieldset style="background-color: #eaeaea;">
<legend>
Update Status
</legend>
<div>
<!--<input id="cancel_button" type="button" value="X">-->
<!--<span id="cancel_button" class="btn btn-success btn-lg">
<div class="col-md-8">
<fieldset style="background-color: #eaeaea;">
<legend>
Update Status
</legend>
<div>
<!--<input id="cancel_button" type="button" value="X">-->
<!--<span id="cancel_button" class="btn btn-success btn-lg">
<i class="glyphicon glyphicon-remove-circle"></i>
</span>-->
<a id="cancel_button" ng-click="unSelect()" tooltip="Close">
<a id="cancel_button" ng-click="unSelect()" tooltip="Close">
<span class="glyphicon glyphicon-remove-circle"></span>
</a>
</div>
<div class="row">
<div class="col-md-4 form-group" ng-class="{'has-error':Form.semYear.$dirty && Form.semYear.$invalid, 'has-success':Form.semYear.$valid}">
<label for="form-field-select-2">
</div>
<div class="row">
<div class="col-md-4 form-group" ng-class="{'has-error':Form.semYear.$dirty && Form.semYear.$invalid, 'has-success':Form.semYear.$valid}">
<label for="form-field-select-2">
Sem/Year <span class="symbol required"></span>
</label>
<select class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="semYear" ng-model="myStatusModel.semYear"
required>
<select class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="semYear" ng-model="myStatusModel.semYear"
required>
<option value="" disabled selected>Select Sem/Year</option>
<option ng-repeat="itemSemY in semYearList" value="{{itemSemY.ID}}">{{itemSemY.Sem_Year}}</option>
</select>
<span class="error text-small block" ng-if="Form.semYear.$dirty && Form.semYear.$error.required">Sem/Year is Required</span>
<span class="error text-small block" ng-if="Form.semYear.$dirty && Form.semYear.$error.required">Sem/Year is Required</span>
</div>
<div class="col-md-4 form-group" ng-class="{'has-error':Form.status.$dirty && Form.status.$invalid, 'has-success':Form.status.$valid}">
<label for="form-field-select-2">
</div>
<div class="col-md-4 form-group" ng-class="{'has-error':Form.status.$dirty && Form.status.$invalid, 'has-success':Form.status.$valid}">
<label for="form-field-select-2">
Status <span class="symbol required"></span>
</label>
<select class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="status" ng-model="myStatusModel.staus"
required>
<select class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="status" ng-model="myStatusModel.staus"
required>
<option value="" disabled selected>Select Status</option>
<option ng-repeat="itemStatus in statusDetailsList" value="{{itemStatus.ListCode}}">{{itemStatus.ListName}}</option>
</select>
<span class="error text-small block" ng-if="Form.status.$dirty && Form.status.$error.required">Status is Required</span>
<span class="error text-small block" ng-if="Form.status.$dirty && Form.status.$error.required">Status is Required</span>
</div>
<!--<div class="col-md-4 form-group" ng-class="{'has-error':Form.status.$dirty && Form.status.$invalid , 'has-success':Form.status.$valid}">
</div>
<!--<div class="col-md-4 form-group" ng-class="{'has-error':Form.status.$dirty && Form.status.$invalid , 'has-success':Form.status.$valid}">
<label>
Status <span
class="symbol required"></span>
@ -284,74 +285,194 @@
required/>
<span class="error text-small block" ng-if="Form.sestatusmYear.$dirty && Form.status.$error.required">Status is Required </span>
</div>-->
<div data-ng-controller="DatepickerDemoCtrl">
<div class="col-md-4 form-group" ng-class="{'has-error':Form.dateofstaus.$dirty && Form.dateofstaus.$invalid, 'has-success':Form.dateofstaus.$valid}">
<label>
<div data-ng-controller="DatepickerDemoCtrl">
<div class="col-md-4 form-group" ng-class="{'has-error':Form.dateofstaus.$dirty && Form.dateofstaus.$invalid, 'has-success':Form.dateofstaus.$valid}">
<label>
Date <span
class="symbol required"></span>
</label>
<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"
datepicker-options="dateOptions" placeholder="Select Date " close-text="Close"
required="required" ng-change="getMaxEndDate(myModel.startDate)"
/>
<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"
datepicker-options="dateOptions" placeholder="Select Date "
close-text="Close" required="required" ng-change="getMaxEndDate(myModel.startDate)"
/>
<!--<input type="text" tabindex="28" class="form-control" ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModelCourseAdd.dateofjoining"
<!--<input type="text" tabindex="28" class="form-control" ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModelCourseAdd.dateofjoining"
is-open="startOpen" ng-init="startOpen = false" name="dateofjoining" datepicker-options="dateOptions"
placeholder="Select Date of Joining" close-text="Close" required="required" datepicker-position="top"
/>-->
<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.$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>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6 form-group" ng-class="{'has-error':Form.description.$dirty && Form.description.$invalid}">
<label>
<div class="row">
<div class="col-md-6 form-group" ng-class="{'has-error':Form.description.$dirty && Form.description.$invalid}">
<label>
Comments
</label>
<textarea type="text" placeholder="Enter Comments" tabindex="7" class="form-control" name="description" ng-model="myStatusModel.comment"
/>
<span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span>
<textarea type="text" placeholder="Enter Comments" tabindex="7" class="form-control" name="description" ng-model="myStatusModel.comment"
/>
<span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span>
</div>
</div>
<div class="col-md-6 form-group" ng-class="{'has-error':Form.branch.$dirty && Form.branch.$invalid, 'has-success':Form.branch.$valid}">
<label for="form-field-select-2">
<!--<pre>{{localBranchDetails}}</pre>
<pre>{{branchList_data}}</pre>-->
<div class="row">
<div class="col-md-12">
<div class="pull-right">
<button type="submit" ng-disabled="disableButton" tabindex="8" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success"
data-style="zoom-in">
<i class="fa fa-circle-o-notch fa-spin" ng-if="disableButton" style="font-size:14px"></i>
Submit
</button>
<button type="reset" tabindex="9" class="btn btn-warning btn-wide" tabindex="9" ng-click="employeeForm.resetCourse(Form)">
Reset
</button>
</div>
</div>
</div>
</fieldset>
</div>
<div class="col-md-2">
</div>
</div>
</div>
</form>
</div>
<div ng-if="localTypeSuperAdmin">
<form name="Form" id="form" novalidate ng-submit="statusUpdate.submit(Form, myStatusModel, localBranchDetails)" method="post">
<div id="bottom1" class="container">
<div class="row">
<div class="col-md-2">
</div>
<div class="col-md-8">
<fieldset style="background-color: #eaeaea;">
<legend>
Update Status
</legend>
<div>
<!--<input id="cancel_button" type="button" value="X">-->
<!--<span id="cancel_button" class="btn btn-success btn-lg">
<i class="glyphicon glyphicon-remove-circle"></i>
</span>-->
<a id="cancel_button" ng-click="unSelect()" tooltip="Close">
<span class="glyphicon glyphicon-remove-circle"></span>
</a>
</div>
<div class="row">
<div class="col-md-4 form-group" ng-class="{'has-error':Form.semYear.$dirty && Form.semYear.$invalid, 'has-success':Form.semYear.$valid}">
<label for="form-field-select-2">
Sem/Year <span class="symbol required"></span>
</label>
<select class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="semYear" ng-model="myStatusModel.semYear"
required>
<option value="" disabled selected>Select Sem/Year</option>
<option ng-repeat="itemSemY in semYearList" value="{{itemSemY.ID}}">{{itemSemY.Sem_Year}}</option>
</select>
<span class="error text-small block" ng-if="Form.semYear.$dirty && Form.semYear.$error.required">Sem/Year is Required</span>
</div>
<div class="col-md-4 form-group" ng-class="{'has-error':Form.status.$dirty && Form.status.$invalid, 'has-success':Form.status.$valid}">
<label for="form-field-select-2">
Status <span class="symbol required"></span>
</label>
<select class="form-control" tabindex="4" class="cs-select cs-skin-elastic" name="status" ng-model="myStatusModel.staus"
required>
<option value="" disabled selected>Select Status</option>
<option ng-repeat="itemStatus in statusDetailsList" value="{{itemStatus.ListCode}}">{{itemStatus.ListName}}</option>
</select>
<span class="error text-small block" ng-if="Form.status.$dirty && Form.status.$error.required">Status is Required</span>
</div>
<!--<div class="col-md-4 form-group" ng-class="{'has-error':Form.status.$dirty && Form.status.$invalid , 'has-success':Form.status.$valid}">
<label>
Status <span
class="symbol required"></span>
</label>
<input type="text" name="status" tabindex="5" placeholder="Enter Status" class="form-control" ng-model="myStatusModel.staus"
required/>
<span class="error text-small block" ng-if="Form.sestatusmYear.$dirty && Form.status.$error.required">Status is Required </span>
</div>-->
<div data-ng-controller="DatepickerDemoCtrl">
<div class="col-md-4 form-group" ng-class="{'has-error':Form.dateofstaus.$dirty && Form.dateofstaus.$invalid, 'has-success':Form.dateofstaus.$valid}">
<label>
Date <span
class="symbol required"></span>
</label>
<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"
datepicker-options="dateOptions" placeholder="Select Date "
close-text="Close" required="required" ng-change="getMaxEndDate(myModel.startDate)"
/>
<!--<input type="text" tabindex="28" class="form-control" ng-click="startOpen = !startOpen" datepicker-popup="dd-MM-yyyy" ng-model="myModelCourseAdd.dateofjoining"
is-open="startOpen" ng-init="startOpen = false" name="dateofjoining" datepicker-options="dateOptions"
placeholder="Select Date of Joining" close-text="Close" required="required" datepicker-position="top"
/>-->
<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>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6 form-group" ng-class="{'has-error':Form.description.$dirty && Form.description.$invalid}">
<label>
Comments
</label>
<textarea type="text" placeholder="Enter Comments" tabindex="7" class="form-control" name="description" ng-model="myStatusModel.comment"
/>
<span class="error text-small block" ng-if="Form.description.$dirty && Form.description.$error.pattern">Invalid Comments</span>
</div>
<div class="col-md-6 form-group" ng-class="{'has-error':Form.branch.$dirty && Form.branch.$invalid, 'has-success':Form.branch.$valid}">
<label for="form-field-select-2">
Select Branch <span
class="symbol required"></span>
</label>
<select class="form-control" tabindex="8" class="cs-select cs-skin-elastic" name="branch" ng-model="localBranchDetails" ng-change="changeBranch()"
required>
<select class="form-control" tabindex="8" class="cs-select cs-skin-elastic" name="branch" ng-model="localBranchDetails" required>
<option value="" disabled selected>Select Branch</option>
<option ng-repeat="bdata in branchList_data" value="{{bdata.BranchCode}}">{{bdata.BranchName}}</option>
</select>
<span class="error text-small block" ng-if="Form.branch.$dirty && Form.branch.$invalid" ng-hide="Form.branch.$error.maxlength">Branch is required.</span>
<span class="error text-small block" ng-if="Form.branch.$dirty && Form.branch.$invalid" ng-hide="Form.branch.$error.maxlength">Branch is required.</span>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="pull-right">
<button type="submit" ng-disabled="disableButton" tabindex="8" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success"
data-style="zoom-in">
<!--<pre>{{localBranchDetails}}</pre>
<pre>{{branchList_data}}</pre>-->
<div class="row">
<div class="col-md-12">
<div class="pull-right">
<button type="submit" ng-disabled="disableButton" tabindex="8" ladda="ldloading1.zoom_in" class="btn btn-wide btn-success"
data-style="zoom-in">
<i class="fa fa-circle-o-notch fa-spin" ng-if="disableButton" style="font-size:14px"></i>
Submit
</button>
<button type="reset" tabindex="9" class="btn btn-warning btn-wide" tabindex="9" ng-click="employeeForm.resetCourse(Form)">
<button type="reset" tabindex="9" class="btn btn-warning btn-wide" tabindex="9" ng-click="employeeForm.resetCourse(Form)">
Reset
</button>
</div>
</div>
</div>
</div>
</fieldset>
</div>
</fieldset>
</div>
<div class="col-md-2">
<div class="col-md-2">
</div>
</div>
</div>
</div>
</form>
</form>
</div>
</div>
</div>

9
Apollo/index.html
View File

@ -1,6 +1,8 @@
<!DOCTYPE html>
<html lang="en" data-ng-app="clipApp">
<head>
<!--<base href="http://localhost/apollo_New_Update_03-01/apollodec/Apollo/" />-->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="description" content="{{app.description}}">
@ -64,10 +66,13 @@
<!-- Angular Scroll -->
<script src="bower_components/angular-scroll/angular-scroll.min.js"></script>
<!-- Clip-Two Scripts -->
<script src="assets/js/app.js"></script>
<script src="assets/js/main.js"></script>
<script src="assets/js/config.constant.js"></script>
<script src="assets/js/config.router.js"></script>
<script src="assets/js/config.router.js"></script>
<!-- Clip-Two Directives -->
<script src="assets/js/directives/toggle.js"></script>
<script src="assets/js/directives/perfect-scrollbar.js"></script>
@ -102,5 +107,7 @@
<script src="https://cdn.rawgit.com/niklasvh/html2canvas/0.5.0-alpha2/dist/html2canvas.min.js"></script>
<script src="bower_components/jsPDF/dist/jspdf.debug.js"></script>
<script src="bower_components/angular-save-html-to-pdf/dist/saveHtmlToPdf.min.js"></script>
</body>
</html>