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

search for activity,assign to and status in call tracking and removing abotu us icon in Ck-editor in announcement screen

Browse Source
This commit is contained in:
saravanakumar_kandasami 2017-12-05 14:01:26 +05:30
parent f48efedbe6
commit b00a91c4cf
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Apollo/assets/views/callTrackingDetails.html
View File

@ -65,7 +65,7 @@
$("#search").focus(); $("#search").focus();
}); });
</script> </script>
<div class="col-md-3"> <div class="col-md-2">
<input type="text" <input type="text"
@ -88,12 +88,21 @@
<input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search Date" ng-hide="hideDateSearch==true" /> <input class="form-control" type="text" ng-model="search" id="search" autofocus tabindex="1" placeholder="Search Date" ng-hide="hideDateSearch==true" />
</div> </div>
<div class="col-md-3"> <div class="col-md-2">
<input class="form-control" type="text" ng-model="search2" id="search2" autofocus tabindex="1" placeholder="Search Mobile/Name" /> <input class="form-control" type="text" ng-model="search2" id="search2" autofocus tabindex="1" placeholder="Search Mobile/Name" />
</div> </div>
<!--<div class="col-md-3"> <!-- Search By Activity-->
<input class="form-control" type="text" ng-model="search3" id="search3" autofocus tabindex="1" placeholder="Search Student Name" /> <div class="col-md-2 col-md-offset-2">
</div>--> <input class="form-control" type="text" ng-model="search3.ListName" id="search3" autofocus tabindex="1" placeholder="Search Activity" />
</div>
<!-- Search By Assign To-->
<div class="col-md-2">
<input class="form-control" type="text" ng-model="search4.Firstname" id="search4" autofocus tabindex="1" placeholder="Search Assigned To" />
</div>
<!-- Search By Status-->
<div class="col-md-2">
<input class="form-control" type="text" ng-model="search5.statusListName" id="search5" autofocus tabindex="1" placeholder="Search Status" />
</div>
<br><br> <br><br>
</div> </div>
@ -125,14 +134,12 @@
<th>Course</th> <th>Course</th>
<th>Activity <th>Activity
</th> </th>
<th>Assigned To <th>Assigned To</th>
</th>
<th>Status</th> <th>Status</th>
</tr> </tr>
</thead> </thead>
<tbody dir-paginate="p in data|orderBy:sortKey:reverse|filter:search:strict|filter:search2:strict|itemsPerPage:10"> <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">
<tr ng-click="setEditId(p);" title="Click to view tracking details"> <tr ng-click="setEditId(p);" title="Click to view tracking details">
<td><a href="#" class="text-orange" ng-click="setEditId(p);">{{p.TrackingID}}</a></td> <td><a href="#" class="text-orange" ng-click="setEditId(p);">{{p.TrackingID}}</a></td>
<td>{{p.followupDetails }}</td> <td>{{p.followupDetails }}</td>

2
Apollo/bower_components/ckeditor/config.js vendored
View File

@ -23,7 +23,7 @@ CKEDITOR.editorConfig = function( config ) {
{ name: 'paragraph', groups: [ 'list', 'indent', 'blocks', 'align', 'bidi' ] }, { name: 'paragraph', groups: [ 'list', 'indent', 'blocks', 'align', 'bidi' ] },
{ name: 'styles' }, { name: 'styles' },
{ name: 'colors' }, { name: 'colors' },
{ name: 'about' } //{ name: 'about' }
]; ];
// Remove some buttons provided by the standard plugins, which are // Remove some buttons provided by the standard plugins, which are