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

Merge pull request #1706 from satish-conflux/EDC-ISSUES-FIX

Browse Source 
Fixed issues with Entity datatable checks
This commit is contained in:
Shaik Nazeer Hussain 2016-12-19 10:46:53 +05:30 committed by GitHub
commit 5253565432
10 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4164,6 +4164,10 @@
"label.heading.deleteentitydatatablecheck": "Do you want to remove Entity Data Table Check?",
"label.button.create": "Create",
"error.msg.datatable.no.value.provided.for.required.fields": "Values cannot be empty for required fields in datatable `{{params[0].value}}`",
"m_client": "Client",
"m_group": "Group",
"m_loan": "Loan",
"m_savings_account": "Savings Account",
"": ""

5
app/scripts/controllers/client/CreateClientController.js
View File

@ -12,7 +12,8 @@
scope.clientNonPersonDetails = {};
scope.restrictDate = new Date();
scope.showSavingOptions = false;
scope.opensavingsproduct = false;
scope.savings = {};
scope.savings.opensavingsproduct = false;
scope.forceOffice = null;
scope.showNonPersonOptions = false;
scope.clientPersonId = 1;
@ -282,7 +283,7 @@
this.formData.clientNonPersonDetails.incorpValidityTillDate = dateFilter(scope.first.incorpValidityTillDate, scope.df);
}
if (!scope.opensavingsproduct) {
if (!scope.savings.opensavingsproduct) {
this.formData.savingsProductId = null;
}

12
app/views/clients/createclient.html
View File

@ -276,10 +276,10 @@
<label class="control-label col-sm-2">{{ 'label.input.opensavingsproduct' | translate }}&nbsp;</label>
<div class="col-sm-3">
<input id="opensavingsproduct" type="checkbox" ng-model="opensavingsproduct" ng-true-value="true"
<input id="opensavingsproduct" type="checkbox" ng-model="savings.opensavingsproduct" ng-true-value="true"
ng-false-value="false">
</div>
<div ng-show="opensavingsproduct">
<div ng-show="savings.opensavingsproduct">
<label class="control-label col-sm-2">{{'label.input.savingproduct' | translate}}</label>
<div class="col-sm-3">
@ -454,8 +454,8 @@
{{'label.button.proceed' | translate}}
</button>
<div ng-if="!datatables">
<a id="cancel2" ng-href="{{cancel}}" class="btn btn-default">{{'label.button.cancel' | translate}}</a>
<button id="save2" type="submit" class="btn btn-primary" ng-hide="blockUI" has-permission='CREATE_CLIENT'>{{'label.button.save' | translate}}</button>
<a id="cancel" ng-href="{{cancel}}" class="btn btn-default">{{'label.button.cancel' | translate}}</a>
<button id="save" type="submit" class="btn btn-primary" ng-hide="blockUI" has-permission='CREATE_CLIENT'>{{'label.button.save' | translate}}</button>
<button class="btn btn-info" ng-show="blockUI"><strong>{{'label.button.processing' | translate}}</strong></button>
</div>
</div>
@ -527,8 +527,8 @@
</button>
</div>
<div class="col-md-offset-5" ng-if="$last">
<a id="cancel" ng-href="{{cancel}}" class="btn btn-default">{{'label.button.cancel' | translate}}</a>
<button id="save" type="submit" class="btn btn-primary" ng-hide="blockUI" has-permission='CREATE_CLIENT'>{{'label.button.save' | translate}}</button>
<a id="cancel2" ng-href="{{cancel}}" class="btn btn-default">{{'label.button.cancel' | translate}}</a>
<button id="save2" type="submit" class="btn btn-primary" ng-hide="blockUI" has-permission='CREATE_CLIENT'>{{'label.button.save' | translate}}</button>
<button class="btn btn-info" ng-show="blockUI"><strong>{{'label.button.processing' | translate}}</strong></button>
</div>
</fieldset>

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

@ -823,6 +823,7 @@
</tab>
<tab heading="{{clientdatatable.registeredTableName}}" ng-repeat="clientdatatable in clientdatatables"
select="dataTableChange(clientdatatable)" has-permission='READ_{{clientdatatable.registeredTableName}}'>
<api-validate></api-validate>
<div>
<div data-ng-hide="isClosedClient" class="btn-group pull-right">
<a ng-show="datatabledetails.isData" class="btn btn-danger pull-right"

8
app/views/groups/creategroup.html
View File

@ -135,8 +135,8 @@
{{'label.button.proceed' | translate}}
</button>
<div ng-if="!datatables">
<a id="cancel2" ng-href="{{cancel}}" class="btn btn-default">{{'label.button.cancel' | translate}}</a>
<button id="save2" type="submit" class="btn btn-primary" ng-hide="blockUI" has-permission='CREATE_GROUP'>{{'label.button.save' | translate}}</button>
<a id="cancel" ng-href="{{cancel}}" class="btn btn-default">{{'label.button.cancel' | translate}}</a>
<button id="save" type="submit" class="btn btn-primary" ng-hide="blockUI" has-permission='CREATE_GROUP'>{{'label.button.save' | translate}}</button>
<button class="btn btn-info" ng-show="blockUI"><strong>{{'label.button.processing' | translate}}</strong></button>
</div>
</div>
@ -208,8 +208,8 @@
</button>
</div>
<div class="col-md-offset-5" ng-if="$last">
<a id="cancel" ng-href="{{cancel}}" class="btn btn-default">{{'label.button.cancel' | translate}}</a>
<button id="save" type="submit" class="btn btn-primary" ng-hide="blockUI" has-permission='CREATE_CLIENT'>{{'label.button.save' | translate}}</button>
<a id="cancel2" ng-href="{{cancel}}" class="btn btn-default">{{'label.button.cancel' | translate}}</a>
<button id="save2" type="submit" class="btn btn-primary" ng-hide="blockUI" has-permission='CREATE_CLIENT'>{{'label.button.save' | translate}}</button>
<button class="btn btn-info" ng-show="blockUI"><strong>{{'label.button.processing' | translate}}</strong></button>
</div>
</fieldset>

1
app/views/groups/viewgroup.html
View File

@ -478,6 +478,7 @@
</tab>
<tab heading="{{groupdatatable.registeredTableName}}" ng-repeat="groupdatatable in groupdatatables" has-permission='READ_{{groupdatatable.registeredTableName}}'
select="dataTableChange(groupdatatable)">
<api-validate></api-validate>
<div>
<div data-ng-hide="isClosedGroup" class="btn-group pull-right">
<a ng-show="datatabledetails.isData" class="btn btn-danger pull-right"

10
app/views/loans/newloanaccount.html
View File

@ -69,7 +69,8 @@
<i class="icon-question-sign" tooltip="{{'label.tooltip.submittedon' | translate}}"></i></td>
<td class="paddedbottom10">
<input type="text" id="submittedOnDate" name="submittedon" datepicker-pop="dd MMMM yyyy"
ng-model="date.first" is-open="opened" min="'2000-01-01'" max="restrictDate" class="form-control"/>
ng-model="date.first" is-open="opened" min="'2000-01-01'" max="restrictDate" class="form-control" required/>
<form-validate valattributeform="newloanaccountform" valattribute="submittedon"/>
</td>
<td>
<label title="{{ 'label.input.expecteddisbursementon' | translate }}">{{ 'label.input.disbursementon' | translate }}<span class="required">*</span>:&nbsp;</label>
@ -78,7 +79,8 @@
<td class="paddedbottom10">
<input id="expectedDisbursementDate" sort type="text" name="expecteddisbursementon"
datepicker-pop="dd MMMM yyyy" ng-model="date.second" is-open="opened1" min="minDate"
max="'2020-06-22'" class="form-control"/>
max="'2020-06-22'" class="form-control" required/>
<form-validate valattributeform="newloanaccountform" valattribute="expecteddisbursementon"/>
</td>
</tr>
<tr ng-show="formData.productId">
@ -610,8 +612,8 @@
{{'label.button.proceed' | translate}}
</button>
<div ng-if="!datatables">
<button id="cancel2" type="reset" class="btn btn-default" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
<button id="save2" type="submit" has-permission='CREATE_LOAN' class="btn btn-primary" ng-show="loanaccountinfo">{{'label.button.save' |
<button id="cancel" type="reset" class="btn btn-default" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
<button id="save" type="submit" has-permission='CREATE_LOAN' class="btn btn-primary" ng-show="loanaccountinfo">{{'label.button.save' |
translate}}
</button>
</div>

1
app/views/loans/viewloanaccountdetails.html
View File

@ -848,6 +848,7 @@
</tab>
<tab heading="{{loandatatable.registeredTableName}}" ng-repeat="loandatatable in loandatatables" has-permission='READ_{{loandatatable.registeredTableName}}'
select="dataTableChange(loandatatable)">
<api-validate></api-validate>
<div>
<div data-ng-show="choice" class="btn-group pull-right">
<a ng-show="datatabledetails.isData" class="btn btn-danger pull-right"

4
app/views/savings/new_saving_account_application.html
View File

@ -302,8 +302,8 @@
{{'label.button.proceed' | translate}}
</button>
<div ng-if="!datatables">
<button id="cancel3" ng-click="cancel()" class="btn btn-default">{{ 'label.button.cancel' | translate }}</button>
<button id="save3" type="submit" class="btn btn-primary" ng-show="data" has-permission='CREATE_SAVINGSACCOUNT'>{{
<button id="cancel" ng-click="cancel()" class="btn btn-default">{{ 'label.button.cancel' | translate }}</button>
<button id="save" type="submit" class="btn btn-primary" ng-show="data" has-permission='CREATE_SAVINGSACCOUNT'>{{
'label.button.save' | translate
}}
</button>

1
app/views/savings/view_saving_account_details.html
View File

@ -414,6 +414,7 @@
</tab>
<tab heading="{{savingdatatable.registeredTableName}}" ng-repeat="savingdatatable in savingdatatables" has-permission='READ_{{savingdatatable.registeredTableName}}'
select="dataTableChange(savingdatatable)">
<api-validate></api-validate>
<div data-ng-show="choice" class="btn-group pull-right">
<a ng-show="datatabledetails.isData" class="btn btn-danger pull-right"
has-permission='DELETE_{{savingdatatable.registeredTableName}}'