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

Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec

Browse Source
This commit is contained in:
dineshkumarkannan 2018-05-31 11:04:36 +05:30
commit 713cef0857
6 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Apollo/api/application/models/Fees_status_model.php
View File

@ -560,6 +560,9 @@ class Fees_status_model extends CI_Model
$insertfollowup_Details['FollowupComments']=$arrayDetails['FollowupComments']; $insertfollowup_Details['FollowupComments']=$arrayDetails['FollowupComments'];
$insertfollowup_Details['CreatedBy'] = $arrayDetails['CreatedBy']; $insertfollowup_Details['CreatedBy'] = $arrayDetails['CreatedBy'];
$insertfollowup_Details['CreatedOn'] = $arrayDetails['CreatedOn']; $insertfollowup_Details['CreatedOn'] = $arrayDetails['CreatedOn'];
$insertfollowup_Details['StatusName'] = $arrayDetails['StatusCode'];
$insertfollowup_Details['AssignedStaff'] = $arrayDetails['CreatedBy'];
$this->db->insert(LEAD_TRACKING_FOLLOWUP, $insertfollowup_Details); $this->db->insert(LEAD_TRACKING_FOLLOWUP, $insertfollowup_Details);
// this if for insert follow up details // this if for insert follow up details

3
Apollo/api/application/models/Student_model.php
View File

@ -1090,6 +1090,9 @@ class Student_model extends CI_Model {
$insertfollowup_Details['FollowupComments'] = $arrayDetails['FollowupComments']; $insertfollowup_Details['FollowupComments'] = $arrayDetails['FollowupComments'];
$insertfollowup_Details['CreatedBy'] = $fromDetails['CreatedBy']; $insertfollowup_Details['CreatedBy'] = $fromDetails['CreatedBy'];
$insertfollowup_Details['CreatedOn'] = $arrayDetails['CreatedOn']; $insertfollowup_Details['CreatedOn'] = $arrayDetails['CreatedOn'];
$insertfollowup_Details['StatusName'] = $arrayDetails['StatusCode'];
$insertfollowup_Details['AssignedStaff'] = $arrayDetails['CreatedBy'];
$this->db->insert(LEAD_TRACKING_FOLLOWUP, $insertfollowup_Details); $this->db->insert(LEAD_TRACKING_FOLLOWUP, $insertfollowup_Details);
// this if for insert follow up details // this if for insert follow up details

12
Apollo/assets/views/callTrackingCloseDetails.html
View File

@ -53,10 +53,12 @@
close-text="Close" ng-change="checkDate(myModel)" ng-readonly="true"/> close-text="Close" ng-change="checkDate(myModel)" ng-readonly="true"/>
<input class="form-control" type="text" ng-model="myModel.search" id="search" autofocus placeholder="Search Date" ng-hide="hideDateSearch==true" /> <input class="form-control" type="text" ng-model="myModel.search" id="search" autofocus placeholder="Search Date" ng-hide="hideDateSearch==true" />
</div> </div>
</div>
<div class="col-md-2">
<label>
Search
</label>
<input class="form-control" type="text" ng-model="search2" id="search2" autofocus tabindex="1" placeholder="Search anything" />
</div> </div>
</div> </div>
<div class="table-responsive"> <div class="table-responsive">
@ -92,7 +94,7 @@
</tr> </tr>
</thead> </thead>
<tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|filter:search2:strict| filter:search3:strict| filter:search4:strict| filter:search5:strict|itemsPerPage:10"> <tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|filter:search2:strict|itemsPerPage:10">
<tr> <tr>
<td ng-if="p.Flag==false"> <td ng-if="p.Flag==false">

12
Apollo/assets/views/callTrackingLeadDetails.html
View File

@ -54,10 +54,12 @@
close-text="Close" ng-change="checkDate(myModel)" ng-readonly="true"/> close-text="Close" ng-change="checkDate(myModel)" ng-readonly="true"/>
<input class="form-control" type="text" ng-model="myModel.search" id="search" autofocus placeholder="Search Date" ng-hide="hideDateSearch==true" /> <input class="form-control" type="text" ng-model="myModel.search" id="search" autofocus placeholder="Search Date" ng-hide="hideDateSearch==true" />
</div> </div>
</div>
<div class="col-md-2">
<label>
Search
</label>
<input class="form-control" type="text" ng-model="search2" id="search2" autofocus tabindex="1" placeholder="Search anything" />
</div> </div>
</div> </div>
<div class="table-responsive"> <div class="table-responsive">
@ -93,7 +95,7 @@
</tr> </tr>
</thead> </thead>
<tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|filter:search2:strict| filter:search3:strict| filter:search4:strict| filter:search5:strict|itemsPerPage:10"> <tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|filter:search2:strict|itemsPerPage:10">
<tr> <tr>
<td ng-if="p.Flag==false"> <td ng-if="p.Flag==false">
<a class="glyphicon ng-scope fa margin-right-5 fa-flag text-grey text-extra-large" tooltip="Potential" ng-click="markAsImportant(p.TrackingID,true);"></a> <a class="glyphicon ng-scope fa margin-right-5 fa-flag text-grey text-extra-large" tooltip="Potential" ng-click="markAsImportant(p.TrackingID,true);"></a>

12
Apollo/assets/views/callTrackingPendingDetails.html
View File

@ -54,10 +54,12 @@
close-text="Close" ng-change="checkDate(myModel)" ng-readonly="true"/> close-text="Close" ng-change="checkDate(myModel)" ng-readonly="true"/>
<input class="form-control" type="text" ng-model="myModel.search" id="search" autofocus placeholder="Search Date" ng-hide="hideDateSearch==true" /> <input class="form-control" type="text" ng-model="myModel.search" id="search" autofocus placeholder="Search Date" ng-hide="hideDateSearch==true" />
</div> </div>
</div>
<div class="col-md-2">
<label>
Search
</label>
<input class="form-control" type="text" ng-model="search2" id="search2" autofocus tabindex="1" placeholder="Search anything" />
</div> </div>
</div> </div>
<div class="table-responsive"> <div class="table-responsive">
@ -93,7 +95,7 @@
</tr> </tr>
</thead> </thead>
<tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|filter:search2:strict| filter:search3:strict| filter:search4:strict| filter:search5:strict|itemsPerPage:10"> <tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|filter:search2:strict|itemsPerPage:10">
<tr> <tr>
<td ng-if="p.Flag==false"> <td ng-if="p.Flag==false">
<a class="glyphicon ng-scope fa margin-right-5 fa-flag text-grey text-extra-large" tooltip="Potential" ng-click="markAsImportant(p.TrackingID,true);"></a> <a class="glyphicon ng-scope fa margin-right-5 fa-flag text-grey text-extra-large" tooltip="Potential" ng-click="markAsImportant(p.TrackingID,true);"></a>

2
Apollo/assets/views/student/editStudentDetails.html
View File

@ -633,7 +633,7 @@
</thead> </thead>
<tbody ng-repeat="penddoc in studentPendingDocumentsDetails"> <tbody ng-repeat="penddoc in studentPendingDocumentsDetails">
<tr> <tr>
<td>{{penddoc.Details}}</td> <td><span style="white-space:pre-wrap;">{{penddoc.Details}}</span></td>
<td>{{penddoc.DocumentDate}}</td> <td>{{penddoc.DocumentDate}}</td>
<!--<td> <!--<td>
<span ng-if="penddoc.Status == 1">Open</span> <span ng-if="penddoc.Status == 1">Open</span>