artin/community-app
1
0
Fork 0
mirror of https://github.com/openMF/community-app.git synced 2026-02-06 13:36:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed issues #631, #632

Browse Source
This commit is contained in:
Safiyu 2013-12-19 12:51:04 +05:30
parent e9b9eeea99
commit f4738f9755
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/global-translations/locale-en.json
View File

@ -2341,6 +2341,8 @@
"invalid":"Invalid",
"rejected":"Rejected",
"processed":"Processed",
"viewMakerCheckerTask":"Maker Checker",
"accounting":"Accounting",
"----------------------": "------------"
}

14
app/scripts/controllers/main/ExpertSearchController.js
View File

@ -26,12 +26,14 @@
//recent activities retrieved
//retrieve last 8 recent activities
for(var l=0; l<8;l++){
for(var l=0; l<11;l++){
if(scope.uniqueArray[l]){
scope.recents.push(scope.uniqueArray[l]);
if(scope.uniqueArray[l]!='/'){ if(scope.uniqueArray[l]!='/home'){
scope.recents.push(scope.uniqueArray[l]);
}}
}
}
// 9 recent activities retrieved
// 8 recent activities retrieved
//count duplicates
var i = scope.recent.length;
@ -58,9 +60,11 @@
//retrieving ends here
//retrieve last 8 frequent actions
for(var freq = sortedArray.length-1; freq>sortedArray.length-9;freq--){
for(var freq = sortedArray.length-1; freq>sortedArray.length-11;freq--){
if(sortedArray[freq]){
scope.frequent.push(sortedArray[freq]);
if(sortedArray[freq]!='/'){ if(sortedArray[freq]!='/home'){
scope.frequent.push(sortedArray[freq]);
}}
}
}
// retrieved 8 frequent actions

2
app/views/centers/editcenter.html
View File

@ -32,7 +32,7 @@
<input type="text" id="externalId" ng-model="formData.externalId">
</div>
</div>
<div class="control-group">
<div data-ng-hide="edit.status.value=='Pending'" class="control-group">
<label class="control-label">{{'label.input.activationdate' | translate}}<span class="required">*</span></label>
<div class="controls">
<input class="date-disable" readonly id="activationDate" type="text" datepicker-pop="dd MMMM yyyy" ng-model="first.date" is-open="opened" min="'2000-01-01'" max="restrictDate"/>

2
app/views/clients/viewclient.html
View File

@ -100,7 +100,7 @@
<td><span class="padded-td">{{client.activationDate | DateFormat}}<span data-ng-hide="client.activationDate">{{ 'label.notactivated' | translate }}</span></span></td>
</tr>
<tr data-ng-show="client.officeName">
<th class="table-bold">{{ 'label.input.office' | translate }}.in</th>
<th class="table-bold">{{ 'label.input.office' | translate }}</th>
<td><span class="padded-td">{{client.officeName}}</span></td>
</tr>
<tr>