folloe-up-date
This commit is contained in:
gayathri1990
parent
95888fa9b6
commit
76d9188978
@ -268,11 +268,13 @@ class Student_Controller extends REST_Controller {
|
||||
$localdata = $this->post('localData');
|
||||
$reqData['StudentID'] = $updateDetails['student'];
|
||||
$reqData['Details'] = $updateDetails['doc_Details'];
|
||||
$reqData['DocumentDate']= $updateDetails['documentdate'];
|
||||
$reqData['Status'] = $updateDetails['checkTracking'];
|
||||
$reqData['CreatedBy'] = $localdata['localUserID'];
|
||||
$date = date('Y-m-d H:i:s');
|
||||
$reqData['CreatedOn'] = $date;
|
||||
$addStudentPendingDocDetails = $this->student_model->addStu_PendingDoc_Details($reqData, $localdata);
|
||||
//print_r($reqData);
|
||||
if ($addStudentPendingDocDetails) {
|
||||
$addStudentPendingDocDetails['status'] = REST_Controller::HTTP_OK;
|
||||
// Set the response and exit
|
||||
|
||||
@ -805,7 +805,8 @@ class Student_model extends CI_Model {
|
||||
}
|
||||
|
||||
public function getStudent_PendingDoc_Details($stuID, $localData) {
|
||||
$localBranch = localData['localBranchID'];
|
||||
$localBranch = $localData['localBranchID'];
|
||||
|
||||
$this->db->select('*');
|
||||
$this->db->order_by('CreatedOn', 'DESC');
|
||||
$this->db->from(STUDENTDOCUMENTTRACKDETAILS);
|
||||
@ -1022,7 +1023,7 @@ class Student_model extends CI_Model {
|
||||
$arrayDetails['StatusCode'] = $checkApplicationStatus->ListCode;
|
||||
$arrayDetails['CreatedBranch'] = $localdata['localBranchID'];
|
||||
$arrayDetails['CreatedOn'] = $fromDetails['CreatedOn'];
|
||||
$arrayDetails['FollowupOn'] = $date = date('d-m-Y');
|
||||
$arrayDetails['FollowupOn']=$fromDetails['DocumentDate'];
|
||||
$arrayDetails['FollowupComments'] = $fromDetails['Details'];
|
||||
if ($localdata['localType'] == SUPER_ADMIN) {
|
||||
$this->db->select('LO.ID');
|
||||
|
||||
@ -1189,6 +1189,7 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
|
||||
|
||||
$scope.myModelAddPendingDocDetails = {
|
||||
"documentDetails": "",
|
||||
"documentdate":"",
|
||||
"checkTracking": false
|
||||
}
|
||||
$scope.documentTrackAddDetailsLoading = false;
|
||||
@ -1215,7 +1216,8 @@ app.controller('studentCtrl', ["$scope", "toaster", "$filter", "ngTableParams",
|
||||
var ModelDetails = {
|
||||
"student": stuID,
|
||||
"doc_Details": myModelAddPendingDocDetails.documentDetails,
|
||||
"checkTracking": myModelAddPendingDocDetails.checkTracking
|
||||
"checkTracking": myModelAddPendingDocDetails.checkTracking,
|
||||
"documentdate": myModelAddPendingDocDetails.date
|
||||
};
|
||||
var updateStudentPendingDocDetails = {
|
||||
method: 'POST',
|
||||
@ -2749,10 +2751,14 @@ 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.docFollowupDate = new Date(myModelAddPendingDocDetails.documentDate).toDateString();
|
||||
//alert($filter('date')(new Date($scope.docFollowupDate),'dd-MM-yyyy'));
|
||||
// exist();
|
||||
var ModelDetails = {
|
||||
"student" : stuID,
|
||||
"doc_Details": myModelAddPendingDocDetails.documentDetails,
|
||||
"checkTracking": myModelAddPendingDocDetails.checkTracking
|
||||
"checkTracking": myModelAddPendingDocDetails.checkTracking,
|
||||
"documentdate" :$filter('date')(new Date($scope.docFollowupDate),'dd-MM-yyyy')
|
||||
};
|
||||
var updateStudentPendingDocDetails = {
|
||||
method: 'POST',
|
||||
|
||||
@ -539,7 +539,7 @@
|
||||
<form name="FormPendDoc" id="formPendDoc" novalidate ng-submit="studentEntrollPendingDocFORM.submit(FormPendDoc, myModelAddPendingDocDetails, p.StudentID)"
|
||||
method="post">
|
||||
<div class="row">
|
||||
<div class="col-md-6 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.documentDetails.$dirty && FormPendDoc.documentDetails.$invalid, 'has-success':FormPendDoc.documentDetails.$valid}">
|
||||
<label>
|
||||
Pending Document Details <span
|
||||
class="symbol required"></span>
|
||||
@ -550,8 +550,34 @@
|
||||
<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>
|
||||
</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">
|
||||
|
||||
<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"
|
||||
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="success text-small block"-->
|
||||
<!--ng-if="Form.date.$valid ">Thank You</span>-->
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-md-3 form-group">
|
||||
</div>
|
||||
|
||||
<div class="col-md-2 form-group">
|
||||
<label>
|
||||
Track Status
|
||||
</label>
|
||||
@ -570,7 +596,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-2">
|
||||
<label>
|
||||
</label>
|
||||
<div>
|
||||
@ -596,7 +622,8 @@
|
||||
<table class="table table-hover">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Details</th>
|
||||
<th>Detail</th>
|
||||
<!--<th>Follow_Up_Date</th>-->
|
||||
<th>Status</th>
|
||||
<th class="center">Delete</th>
|
||||
</tr>
|
||||
@ -604,6 +631,7 @@
|
||||
<tbody ng-repeat="penddoc in studentPendingDocumentsDetails">
|
||||
<tr>
|
||||
<td>{{penddoc.Details}}</td>
|
||||
<!--<td>{{penddoc.DocumentDate}}</td>-->
|
||||
<td>
|
||||
<span ng-if="penddoc.Status == 1">Open</span>
|
||||
<span ng-if="penddoc.Status == 0">Close</span>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user