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 #1576 from nazeer1100126/develop_sharesissues

Browse Source 
fixed issued reported by QA on shares and dividend module
This commit is contained in:
Shaik Nazeer Hussain 2016-04-20 10:50:40 +05:30
commit 4114a159cc
14 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,10 +140,13 @@
"label.heading.dividendperiodstartdate" : "Dividend Period Start Date",
"label.heading.dividendperiodenddate" : "Dividend Period End Date",
"label.heading.dividendamount" : "Dividend Amount",
"label.heading.equity": "Equity",
"label.heading.shareequity": "Share Equity",
"label.heading.dividends": "dividends",
"label.heading.savingtransactionreference":"Transaction Reference",
"label.heading.amountreceivedorreturned": "Amount Received/Returned",
"label.heading.totalamountreceivedorreturned": "Total Amount Receivable/Returned",
"label.heading.equity": "Equity",
"#Menu Links": "..",
"label.menu.selectloanofficer": "Select Staff",
"label.menu.selectone": "Select One",
@ -2907,7 +2910,6 @@
"label.heading.chargeamount":"Charge Amount",
"label.heading.sharereference": "Shares Reference",
"label.heading.sharecontrol": "Shares Suspense Control",
"label.heading.equity": "Equity",
"#Anchors": "..",
"label.anchor.products": "Products",

5
app/scripts/controllers/product/CreateShareProductController.js
View File

@ -12,13 +12,8 @@
scope.equityAccountOptions = scope.product.accountingMappingOptions.equityAccountOptions || [] ;
scope.liabilityAccountOptions = scope.product.accountingMappingOptions.liabilityAccountOptions || [];
scope.incomeAccountOptions = scope.product.accountingMappingOptions.incomeAccountOptions || [];
scope.formData.currencyCode = data.currencyOptions[0].code;
scope.formData.digitsAfterDecimal = data.currencyOptions[0].decimalPlaces;
scope.formData.interestCompoundingPeriodType = data.interestCompoundingPeriodType.id;
scope.formData.interestPostingPeriodType = data.interestPostingPeriodType.id;
scope.formData.interestCalculationType = data.interestCalculationType.id;
scope.formData.interestCalculationDaysInYearType = data.interestCalculationDaysInYearType.id;
scope.formData.accountingRule = '1';
});

2
app/scripts/controllers/product/ShareProductActionsController.js
View File

@ -19,7 +19,7 @@
resourceFactory.shareProduct.get({shareProductId: routeParams.productId}, function (data) {
scope.shareproductDetails = data;
}) ;
scope.title = 'label.heading.approveshareaccount';
scope.title = 'label.heading.initiatedividend';
scope.fromDatelabelName = 'label.input.dividendperiodstartdate';
scope.endDatelabelName = 'label.input.dividendperiodenddate';
scope.createdividend = true;

4
app/scripts/controllers/product/ShareProductDividendController.js
View File

@ -7,8 +7,8 @@
scope.shareproduct = data;
});
scope.routeTo = function (id) {
location.path('/dividends/' + routeParams.productId+'/dividend/'+id);
scope.routeTo = function (id, status) {
location.path('/dividends/' + routeParams.productId+'/dividend/'+id+"/"+status);
scope.saveSC();
};

3
app/scripts/controllers/product/ViewShareProductDividendController.js
View File

@ -3,6 +3,9 @@
ViewShareProductDividendController: function (scope, routeParams, paginatorService, resourceFactory, location) {
scope.dividendTransactions = [];
scope.isdividendPosted = false ;
if(routeParams.status && (routeParams.status== 'Dividend Approved' || routeParams.status== 'Dividend Posted')) {
scope.isdividendPosted = true ;
}
resourceFactory.shareProduct.get({shareProductId: routeParams.productId}, function (data) {
scope.shareproduct = data;
});

2
app/scripts/controllers/shares/EditShareAccountController.js
View File

@ -71,7 +71,7 @@
if (scope.clientId) this.formData.clientId = scope.clientId;
if (scope.charges.length > 0) {
for (var i in scope.charges) {
this.formData.charges.push({ id: scope.charges[i].id, chargeId: scope.charges[i].chargeId, amount: scope.charges[i].amount});
this.formData.charges.push({ id: scope.charges[i].id, chargeId: scope.charges[i].chargeId, amount: scope.charges[i].amountOrPercentage});
}
}
resourceFactory.sharesAccount.put({shareAccountId: routeParams.accountId}, this.formData, function (data) {

2
app/scripts/routes.js
View File

@ -875,7 +875,7 @@
.when('/dividends/:productId/', {
templateUrl: 'views/products/dividendlisting.html'
})
.when('/dividends/:productId/dividend/:dividendId', {
.when('/dividends/:productId/dividend/:dividendId/:status', {
templateUrl: 'views/products/viewdividends.html'
})
.when('/shareproduct/:productId/:action', {

2
app/views/products/createshareproduct.html
View File

@ -311,7 +311,7 @@
</div>
<hr>
<div class="form-group">
<h4>{{"label.heading.equity" | translate}}</h4>
<h4>{{"label.heading.shareequity" | translate}}</h4>
<label class="control-label col-sm-2">{{ 'label.input.equity' | translate }}</label>
<i class="icon-question-sign col-sm-1 icon-white" tooltip="{{'label.tooltip.equityaccount' | translate}}"></i>
<div class="col-sm-3">

10
app/views/products/dividendlisting.html
View File

@ -21,11 +21,11 @@
</thead>
<tbody>
<tr class="pointer-main" ng-repeat="dividend in dividendTransactions.currentPageItems | orderBy:'name':reverse | filter:filterText">
<td class="pointer" data-ng-click="routeTo(dividend.id)">{{dividend.productData.name}}</td>
<td class="pointer" data-ng-click="routeTo(dividend.id)">{{dividend.dividendPeriodStartDate | DateFormat}}</td>
<td class="pointer" data-ng-click="routeTo(dividend.id)">{{dividend.dividendPeriodEndDate | DateFormat}}</td>
<td class="pointer" data-ng-click="routeTo(dividend.id)">{{dividend.amount | number}}</td>
<td class="pointer" data-ng-click="routeTo(dividend.id)">{{dividend.status.value}}</td>
<td class="pointer" data-ng-click="routeTo(dividend.id, dividend.status.value)">{{dividend.productData.name}}</td>
<td class="pointer" data-ng-click="routeTo(dividend.id, dividend.status.value)">{{dividend.dividendPeriodStartDate | DateFormat}}</td>
<td class="pointer" data-ng-click="routeTo(dividend.id, dividend.status.value)">{{dividend.dividendPeriodEndDate | DateFormat}}</td>
<td class="pointer" data-ng-click="routeTo(dividend.id, dividend.status.value)">{{dividend.amount | number}}</td>
<td class="pointer" data-ng-click="routeTo(dividend.id, dividend.status.value)">{{dividend.status.value}}</td>
</tr>
</tbody>
</table>

2
app/views/products/editshareproduct.html
View File

@ -310,7 +310,7 @@
</div>
<hr>
<div class="form-group">
<h4>{{"label.heading.equity" | translate}}</h4>
<h4>{{"label.heading.shareequity" | translate}}</h4>
<label class="control-label col-sm-2">{{ 'label.input.equity' | translate }}</label>
<i class="icon-question-sign col-sm-1 icon-white" tooltip="{{'label.tooltip.equityaccount' | translate}}"></i>
<div class="col-sm-3">

2
app/views/products/viewdividends.html
View File

@ -7,7 +7,7 @@
</ul>
<input ng-autofocus="true" ng-model="filterText" type="text" ng-keyup="onFilter()" class="form-control" placeholder="{{'label.input.filterbynameshortname' | translate}}">
<div class="btn-group pull-right">
<div class="btn-group pull-right" ng-show="!isdividendPosted">
<button type="button" data-ng-click="postDividends()" class="btn btn-primary" has-permission='POST_DIVIDENDS'><i
class="icon-briefcase icon-white"></i>{{'label.button.postdividends' | translate}}
</button>

2
app/views/products/viewshareproduct.html
View File

@ -144,7 +144,7 @@
<td colspan="3">{{shareproduct.accountingMappings.shareSuspenseId.name}}</td>
</tr>
<tr>
<td>{{'label.heading.equity' | translate}}({{'label.heading.equity' |
<td>{{'label.heading.shareequity' | translate}}({{'label.heading.equity' |
translate}})
</td>
<td colspan="3">{{shareproduct.accountingMappings.shareEquityId.name}}</td>

2
app/views/shares/editshareaccount.html
View File

@ -191,7 +191,7 @@
<td>{{charge.name}},{{charge.currency.displaySymbol}}</td>
<td>{{charge.chargeCalculationType.value}}</td>
<td><input id="charges[{{$index}}].amount" class="input-sm form-control" type="text"
ng-model="charge.amount" number-format
ng-model="charge.amountOrPercentage" number-format
placeholder="{{'label.input.amount' | translate}}"/></td>
<td>{{charge.chargeTimeType.value}}</td>
<td><a ng-click="deleteCharge($index)"><i class="icon-remove icon-white"></i></a></td>

1
app/views/shares/viewshareaccount.html
View File

@ -94,6 +94,7 @@
<th>{{'label.heading.chargeamount' | translate}}</th>
<th>{{'label.heading.amountreceivedorreturned' | translate}}</th>
</tr>
<tr class="pointer-main" ng-repeat="purchasedShare in purchasedShares">
<td>{{purchasedShare.purchasedDate | DateFormat}}</td>