mirror of
https://github.com/openMF/community-app.git
synced 2026-02-06 14:11:54 +00:00
UI Alignment fixes
This commit is contained in:
parent
86e1fefe39
commit
0fcadc2a35
@ -244,6 +244,7 @@
|
||||
"error.msg.invalid.recurring.rule": "The calendar recurring rule : `{{params[0].value}}` is not valid.",
|
||||
"error.msg.recurring.rule.parsing.error": "Error in parsing the Recurring Rule value: `{{params[0].value}}`",
|
||||
"error.msg.calendar.loan.actual.disbursement.date.not.valid.recurring.date": "Actual disbursement date `{{params[0].value}}` does not fall on a meeting date.",
|
||||
"error.msg.calendar.collectionsheet.not.valid.recurring.date":"Selected calendar date is not a valid recurrence date",
|
||||
"validation.msg.loan.calendarId.not.greater.than.zero": "Meeting Calendar is mandatory.",
|
||||
"validation.msg.collectionsheet.groupId.not.greater.than.zero": "Group is mandatory to generate collection sheet.",
|
||||
"validation.msg.collectionsheet.dueDate.cannot.be.blank": "Date of transaction is mandatory to generate collection sheet.",
|
||||
@ -541,11 +542,13 @@
|
||||
"label.heading.role": "Role",
|
||||
"label.heading.center":"Center",
|
||||
"label.heading.attachmeeting": "Attach Meeting",
|
||||
"label.heading.editmeeting": "Edit Meeting",
|
||||
|
||||
"#Menu Links": "..",
|
||||
"label.menu.selectoffice": "Select Office",
|
||||
"label.menu.selectstaff": "Select Staff",
|
||||
"label.menu.selectgroup": "Select Group",
|
||||
"label.menu.gender": "Select Gender",
|
||||
|
||||
"#Anchors": "..",
|
||||
"label.anchor.groups": "Groups",
|
||||
@ -637,6 +640,7 @@
|
||||
"error.msg.center.activate.date.cannot.be.before.office.activation.date": "The center activation date cannot be before the office activation date.",
|
||||
"error.msg.center.not.active.exception": "The Center with id `{{params[0].value}}` is not active.",
|
||||
"error.msg.Center.close.active.groups.exist":"Cannot close. Active groups exists",
|
||||
"validation.msg.calendar.cannot.be.before.centers.activation.date":"Meeting date cannot be before center activation date",
|
||||
|
||||
"------------": "------------",
|
||||
|
||||
@ -1555,6 +1559,7 @@
|
||||
"validation.msg.savingsaccount.lockinPeriodFrequency.cannot.be.blank": "Locked in for frequency is mandatory.",
|
||||
"validation.msg.savingsaccount.lockinPeriodFrequency.not.greater.than.zero": "Locked in for frequency must be greater than zero if provided.",
|
||||
"validation.msg.savingsaccount.lockinPeriodFrequencyType.cannot.be.blank": "Locked in for period type is mandatory.",
|
||||
"validation.msg.savingsaccountPAY_CHARGE.results.in.balance.going.negative": "Insufficient balance to pay savings charge.",
|
||||
"error.msg.product.savings.invalid.lockin.settings": "Lock-in settings are invalid.",
|
||||
"validation.msg.savingsaccount.close.results.in.balance.not.zero": " for closing savings account, balance must be zero.",
|
||||
"validation.msg.savingsaccount.closedOnDate.cannot.be.blank": "Close date is mandatory.",
|
||||
@ -1787,6 +1792,7 @@
|
||||
"error.msg.holiday.duplicate.name": "holiday name `{{params[0].value}}` already exists.",
|
||||
"error.msg.holiday.repayments.rescheduled.date.should.be.before.from.date.or.after.to.date": "Repayments rescheduled to date should be before from date or after to date.",
|
||||
"error.msg.holiday.repayments.rescheduled.date.should.not.fall.on.non.working.day": "Repayments rescheduled to date should not fall on non working days.",
|
||||
"validation.msg.holiday.offices.cannot.be.blank":"Please select atleast one office",
|
||||
|
||||
"--------------": "------------",
|
||||
|
||||
@ -2091,6 +2097,8 @@
|
||||
"label.anchor.editloanproduct": "Edit Loan Product",
|
||||
"label.anchor.editsavingproduct": "Edit Saving Product",
|
||||
"label.anchor.productsmix": "Products Mix",
|
||||
"label.anchor.productmix": "Product Mix",
|
||||
"label.anchor.viewproductmix": "View Product Mix",
|
||||
"label.anchor.fixeddepositproducts": "Fixed Deposit Products",
|
||||
"label.anchor.interestratechartviewedit":"View / Edit Interest Rate Charts",
|
||||
"label.anchor.interestratecharts":"Interest Rate Charts",
|
||||
@ -2596,6 +2604,12 @@
|
||||
"reportsall":"Reports",
|
||||
"loanscreenreport":"Loan Screen Report",
|
||||
"clientscreenreport":"Client Screen Report",
|
||||
"createstandinginstructionfromsavings":"Create Standing Instruction",
|
||||
"liststandinginstructions":"View Standing Instructions",
|
||||
"viewstandinginstruction":"View Standing Instruction",
|
||||
"listaccounttransactions":"View Account Transactions",
|
||||
"editstandinginstructionlist":"Edit Standing Instruction",
|
||||
"new_client_saving_application":"New Saving Application",
|
||||
|
||||
"-----------------------------":"--------------------",
|
||||
|
||||
|
||||
@ -15,14 +15,20 @@
|
||||
{id: 3, value: "monthly"},
|
||||
{id: 4, value: "yearly"}
|
||||
];
|
||||
scope.repeatsEveryOptions = ["1", "2", "3"];
|
||||
scope.repeatsEveryOptions = [1, 2, 3];
|
||||
scope.selectedPeriod(scope.calendarData.frequency.id);
|
||||
//to display default in select boxes
|
||||
scope.formData = {
|
||||
repeating: scope.calendarData.repeating,
|
||||
frequency: scope.calendarData.frequency.id,
|
||||
interval: scope.calendarData.interval
|
||||
interval: Math.abs(scope.calendarData.interval)
|
||||
}
|
||||
for(var i in scope.repeatsEveryOptions){
|
||||
if (scope.formData.interval == scope.repeatsEveryOptions[i]){
|
||||
scope.formData.interval = scope.repeatsEveryOptions[i];
|
||||
}
|
||||
}
|
||||
console.log(scope.formData);
|
||||
//update interval option
|
||||
for (var i in scope.repeatsEveryOptions) {
|
||||
if (scope.repeatsEveryOptions[i] == scope.calendarData.interval) {
|
||||
|
||||
@ -41,6 +41,21 @@
|
||||
scope.columnHeaders = data.columnHeaders;
|
||||
});
|
||||
|
||||
//return input type
|
||||
scope.fieldType = function (type) {
|
||||
var fieldType = "";
|
||||
if (type) {
|
||||
if (type == 'STRING' || type == 'INTEGER' || type == 'TEXT' || type == 'DECIMAL') {
|
||||
fieldType = 'TEXT';
|
||||
} else if (type == 'CODELOOKUP' || type == 'CODEVALUE') {
|
||||
fieldType = 'SELECT';
|
||||
} else if (type == 'DATE') {
|
||||
fieldType = 'DATE';
|
||||
}
|
||||
}
|
||||
return fieldType;
|
||||
};
|
||||
|
||||
scope.editDatatableEntry = function () {
|
||||
scope.isViewMode = false;
|
||||
var colName = scope.columnHeaders[0].columnName;
|
||||
|
||||
@ -915,7 +915,7 @@ a.no-decorate {
|
||||
padding:15px;
|
||||
margin-left: 70px;
|
||||
height:50px;
|
||||
width:130px;
|
||||
width:202px;
|
||||
overflow:hidden;
|
||||
background-color: #555555;
|
||||
z-index: -1;
|
||||
|
||||
1
app/styles/bootstrap-ext.css
vendored
1
app/styles/bootstrap-ext.css
vendored
@ -234,3 +234,4 @@ api-validate label {
|
||||
.muted {
|
||||
color: #bbbbbb;
|
||||
}
|
||||
select[multiple]{min-height: 30px;}
|
||||
@ -4,11 +4,12 @@
|
||||
<li class="active">{{'label.anchor.viewroles' | translate}}</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="pull-right row">
|
||||
<div class="pull-right">
|
||||
<a href="#/admin/addrole" class="btn btn-primary" has-permission='CREATE_ROLE'><i class="icon-plus icon-white"></i> {{'label.button.addrole' |
|
||||
translate}}</a>
|
||||
</div>
|
||||
<div class="row-fluid row" data-ng-controller="RoleController">
|
||||
<div data-ng-controller="RoleController">
|
||||
<br>
|
||||
<table class="table">
|
||||
<thead>
|
||||
<tr class="graybg">
|
||||
|
||||
@ -1,26 +1,29 @@
|
||||
<form class="well" data-ng-controller="CloseCenterController">
|
||||
<form class="form-horizontal well" data-ng-controller="CloseCenterController">
|
||||
<api-validate></api-validate>
|
||||
<div class="paddedleft">
|
||||
<h3><strong>{{ 'label.heading.confirm' | translate }}</strong></h3>
|
||||
|
||||
<div>
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-2">{{ 'label.input.closuredate' | translate }}<span
|
||||
class="required">*</span></label>
|
||||
<div class="col-sm-3">
|
||||
<input id="closureDate" type="text" datepicker-pop="dd MMMM yyyy" ng-model="first.date" is-open="opened"
|
||||
min="'2000-01-01'" max="restrictDate" class="form-control"/>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-2">{{ 'label.input.closurereason' | translate }}<span
|
||||
class="required">*</span></label>
|
||||
<select id="closureReasonId" ng-model="formData.closureReasonId" class="form-control"
|
||||
<div class="col-sm-3">
|
||||
<select id="closureReasonId" ng-model="formData.closureReasonId" class="form-control col-sm-3"
|
||||
ng-options="reason.id as reason.name for reason in template.closureReasons" value="{{reason.id}}">
|
||||
</select>
|
||||
</select></div>
|
||||
</div>
|
||||
<br/>
|
||||
|
||||
<div class="col-md-offset-1">
|
||||
<a id="cancel" href="#/viewcenter/{{center.id}}" class="btn btn-default">{{ 'label.button.cancel' | translate }}</a>
|
||||
<button id="save" type="button" class="btn btn-primary" data-ng-click="closeGroup()" has-permission='CLOSE_CENTER'>{{ 'label.button.close'
|
||||
<div class="col-md-offset-2 paddedleft">
|
||||
<a id="cancel" href="#/viewcenter/{{center.id}}" class="btn btn-default paddedleft">{{ 'label.button.cancel' | translate }}</a>
|
||||
<button id="save" type="button" class="btn btn-primary" data-ng-click="closeGroup()" has-permission='CLOSE_CENTER'>{{ 'label.button.confirm'
|
||||
| translate }}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
@ -55,7 +55,7 @@
|
||||
<li>
|
||||
<a href="#/closecenter/{{center.id}}" has-permission='CLOSE_CENTER'>{{ 'label.button.close' | translate }}</a>
|
||||
</li>
|
||||
<li>
|
||||
<li data-ng-show="center.status.value=='Active'">
|
||||
<a href="#/attachmeeting/{{center.id}}/centers" data-ng-hide="center.collectionMeetingCalendar" has-permission='CREATE_MEETING'>{{ 'label.button.attachmeeting' | translate }}</a>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
@ -17,6 +17,8 @@
|
||||
<div class="col-sm-3">
|
||||
<input id="name" ng-autofocus="true" type="text" name="name" ng-model="formData.name" class="form-control" required
|
||||
late-Validate/>
|
||||
</div>
|
||||
<div class="col-sm-3">
|
||||
<span ng-show="clientidentifierform.name.$invalid">
|
||||
<small class="error" ng-show="clientidentifierform.name.$error.req">
|
||||
Required Field
|
||||
@ -30,7 +32,7 @@
|
||||
class="required">*</span></label>
|
||||
|
||||
<div class="col-sm-3">
|
||||
<input type="file" id="file" ng-file-select="onFileSelect($files)" class="form-control">
|
||||
<input type="file" id="file" ng-file-select="onFileSelect($files)">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@ -143,7 +143,6 @@
|
||||
|
||||
<div class="col-sm-1">
|
||||
<input id="opensavingsproduct" type="checkbox" ng-model="opensavingsproduct"
|
||||
class="form-control"
|
||||
ng-true-value="true" ng-false-value="false">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -1,24 +1,27 @@
|
||||
<form data-ng-controller="CloseGroupController">
|
||||
<form data-ng-controller="CloseGroupController" class="form-horizontal well">
|
||||
<api-validate></api-validate>
|
||||
<div class="paddedleft">
|
||||
<h3>{{ 'label.heading.confirm' | translate }}</h3>
|
||||
|
||||
<div>
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-2">{{ 'label.input.closuredate' | translate }}<span
|
||||
class="required">*</span></label>
|
||||
<input id="closureDate" class="date-disable form-control" type="text" datepicker-pop="dd MMMM yyyy" ng-model="first.date"
|
||||
<div class="col-sm-3">
|
||||
<input id="closureDate" class="date-disable form-control col-sm-3" type="text" datepicker-pop="dd MMMM yyyy" ng-model="first.date"
|
||||
is-open="opened" min="'2000-01-01'" max="restrictDate" readonly/>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-2">{{ 'label.input.closurereasons' | translate }}<span
|
||||
class="required">*</span></label>
|
||||
<div class="col-sm-3">
|
||||
<select id="closureReasonId" ng-model="formData.closureReasonId"
|
||||
ng-options="reason.id as reason.name for reason in template.closureReasons" value="{{reason.id}}" class="form-control">
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<br/>
|
||||
|
||||
<div>
|
||||
<div class="col-md-offset-2 paddedleft">
|
||||
<a id="cancel" href="#/viewgroup/{{group.id}}" class="btn btn-default">{{ 'label.button.cancel' | translate }}</a>
|
||||
<button id="save" type="button" class="btn btn-primary" data-ng-click="closeGroup()" has-permission='CLOSE_GROUP'>{{
|
||||
'label.button.confirm' | translate }}
|
||||
|
||||
@ -12,48 +12,45 @@
|
||||
<api-validate></api-validate>
|
||||
<form ng-submit="submit()">
|
||||
<div class="form-group">
|
||||
<table width="80%" class="form-horizontal">
|
||||
<label class="control-label offset2"><h3>{{'label.heading.editmeeting' | translate}}</h3></label>
|
||||
<table class="form-horizontal width40">
|
||||
<tr>
|
||||
<td width="20%">
|
||||
<label class="control-label col-sm-2">{{'label.input.meetingstartdate' | translate}}<span
|
||||
<td class="width40">
|
||||
<label class="control-label">{{'label.input.meetingstartdate' | translate}}<span
|
||||
class="required">*</span></label>
|
||||
</td>
|
||||
<td width="20%">
|
||||
<td class="width60">
|
||||
<input id="startDate" type="text" datepicker-pop="dd MMMM yyyy" ng-model="first.date"
|
||||
is-open="opened" min="'2000-01-01'" max="restrictDate" class="form-control"/>
|
||||
</td>
|
||||
<td width="20%"></td>
|
||||
<td width="20%"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<label class="control-label col-sm-2">{{'label.input.repeat' | translate}}</label>
|
||||
<label class="control-label">{{'label.input.repeat' | translate}}</label>
|
||||
</td>
|
||||
<td>
|
||||
<input type="checkbox" ng-model="formData.repeating">
|
||||
</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
</table>
|
||||
<span ng-show="formData.repeating"><label class="control-label offset2"><h3>{{'label.heading.repeatdetails'
|
||||
<span ng-show="formData.repeating"><label class="control-label offset2"><h3 class="paddedleft paddedtop">{{'label.heading.repeatdetails'
|
||||
| translate}}</h3></label></span>
|
||||
<table width="40%" ng-show="formData.repeating">
|
||||
<table class="width40" ng-show="formData.repeating">
|
||||
<tr>
|
||||
<td width="30%"></td>
|
||||
<td>
|
||||
<label class="control-label col-sm-2">{{'label.input.repeats' | translate}}</label>
|
||||
<td class="width30">
|
||||
<label class="control-label">{{'label.input.repeats' | translate}}</label>
|
||||
<select class="input-sm form-control" ng-model="formData.frequency"
|
||||
ng-options="repeatsOption.id as repeatsOption.value for repeatsOption in repeatsOptions"
|
||||
ng-change="selectedPeriod(formData.frequency)" value="{{repeatsOption.id}}"
|
||||
ng-disabled=true></select>
|
||||
</td>
|
||||
<td>
|
||||
<label class="control-label col-sm-2">{{'label.input.repeatsevery' | translate}}</label>
|
||||
<td class="width30 paddedleft">
|
||||
<label class="control-label">{{'label.input.repeatsevery' | translate}}</label>
|
||||
<select class="input-sm form-control" ng-model="formData.interval"
|
||||
ng-options="repeatsEveryOption for repeatsEveryOption in repeatsEveryOptions"
|
||||
ng-disabled=true value="{{repeatsEveryOption}}"></select>{{periodValue}}
|
||||
ng-disabled=true value="{{repeatsEveryOption}}"></select>
|
||||
</td>
|
||||
<td class="width40 paddedleft"><label class="paddedtop25px">{{periodValue}}</label></td>
|
||||
</tr>
|
||||
</table>
|
||||
<table width="40%">
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-2">{{ 'label.input.clients' | translate }}</label>
|
||||
<div class="col-md-4">
|
||||
<div class="col-md-3">
|
||||
<select multiple ng-model="tempData" class="form-control">
|
||||
<option ng-repeat="member in allMembers" value="{{member.id}}">{{member.displayName}}</option>
|
||||
</select>
|
||||
|
||||
@ -65,7 +65,7 @@
|
||||
<li>
|
||||
<a href="#/closegroup/{{group.id}}" has-permission='CLOSE_GROUP'>{{ 'label.button.close' | translate }}</a>
|
||||
</li>
|
||||
<li>
|
||||
<li data-ng-show="group.status.value=='Active'">
|
||||
<span ng-hide="group.centerId">
|
||||
<a href="#/attachmeeting/{{group.id}}/groups" has-permission='CREATE_MEETING'
|
||||
data-ng-hide="group.collectionMeetingCalendar">{{ 'label.button.attachmeeting' |
|
||||
@ -229,7 +229,7 @@
|
||||
<td class="pointer" data-ng-click="routeToLoan(loanaccount.id)"><i ng-hide="loanaccount.inArrears"
|
||||
class="icon-stop {{loanaccount.status.code | StatusLookup}}"></i>
|
||||
<i ng-show="loanaccount.inArrears"
|
||||
class="icon-stop {{loanaccount.status.code | StatusLookup}}overdue"></i>{{loanaccount.status.value}}
|
||||
class="icon-stop {{loanaccount.status.code | StatusLookup}}overdue"></i> {{loanaccount.status.value}}
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
@ -250,7 +250,7 @@
|
||||
<td class="pointer" data-ng-click="routeToLoan(loanaccount.id)">{{loanaccount.accountNo}}</td>
|
||||
<td class="pointer" data-ng-click="routeToLoan(loanaccount.id)">{{loanaccount.loanType.value}}</td>
|
||||
<td class="pointer" data-ng-click="routeToLoan(loanaccount.id)"><i
|
||||
class="icon-stop {{loanaccount.status.code | StatusLookup}}"></i>{{loanaccount.status.value}}
|
||||
class="icon-stop {{loanaccount.status.code | StatusLookup}}"></i> {{loanaccount.status.value}}
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
@ -280,7 +280,7 @@
|
||||
<td class="pointer" data-ng-click="routeToSaving(savingaccount.id)">{{savingaccount.accountBalance}}
|
||||
</td>
|
||||
<td class="pointer" data-ng-click="routeToSaving(savingaccount.id)"><i
|
||||
class="icon-stop {{savingaccount.status.code | StatusLookup}}"></i>{{savingaccount.status.value}}
|
||||
class="icon-stop {{savingaccount.status.code | StatusLookup}}"></i> {{savingaccount.status.value}}
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
@ -299,7 +299,7 @@
|
||||
<td class="pointer" data-ng-click="routeToSaving(savingaccount.id)">{{savingaccount.productName}}</td>
|
||||
<td class="pointer" data-ng-click="routeToSaving(savingaccount.id)">{{savingaccount.accountNo}}</td>
|
||||
<td class="pointer" data-ng-click="routeToSaving(savingaccount.id)"><i
|
||||
class="icon-stop {{savingaccount.status.code | StatusLookup}}"></i>{{savingaccount.status.value}}
|
||||
class="icon-stop {{savingaccount.status.code | StatusLookup}}"></i> {{savingaccount.status.value}}
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
||||
@ -16,6 +16,8 @@
|
||||
|
||||
<div class="col-sm-3">
|
||||
<input id="name" type="text" name="name" ng-model="formData.name" class="form-control" required late-Validate/>
|
||||
</div>
|
||||
<div class="col-sm-3">
|
||||
<form-validate valattributeform="loandocumentform" valattribute="name"/>
|
||||
</div>
|
||||
</div>
|
||||
@ -33,7 +35,7 @@
|
||||
class="required">*</span></label>
|
||||
|
||||
<div class="col-sm-3">
|
||||
<input id="file" type="file" ng-file-select="onFileSelect($files)" class="form-control">
|
||||
<input id="file" type="file" ng-file-select="onFileSelect($files)">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@ -265,6 +265,7 @@
|
||||
</table>
|
||||
</div>
|
||||
<hr/>
|
||||
<div class="col-md-12">
|
||||
<label><strong>{{ 'label.heading.charges' | translate }}</strong></label>
|
||||
<select ng-model="chargeFormData.chargeId" class="form-control width170px"
|
||||
ng-options="charge.id as (charge.name + ',' + charge.currency.displaySymbol) for charge in loanaccountinfo.chargeOptions"
|
||||
@ -272,6 +273,7 @@
|
||||
<option value="">{{'label.selectcharge' | translate}}</option>
|
||||
</select>
|
||||
<a ng-click="addCharge()"><i class="icon-plus icon-white"></i></a>
|
||||
</div>
|
||||
<table class="table" class="width100" ng-show="charges.length>0">
|
||||
<tr class="graybg">
|
||||
<th>{{'label.heading.name' | translate}}</th>
|
||||
@ -296,32 +298,34 @@
|
||||
</tr>
|
||||
</table>
|
||||
<div ng-show="loanaccountinfo.overdueCharges.length>0">
|
||||
<label><strong>{{ 'label.heading.overduepenalitycharge' | translate }}</strong></label>
|
||||
<table class="table" class="width100" >
|
||||
<tr class="graybg">
|
||||
<th>{{'label.heading.name' | translate}}</th>
|
||||
<th>{{'label.heading.type' | translate}}</th>
|
||||
<th>{{'label.heading.amount' | translate}}</th>
|
||||
<th>{{'label.heading.collectedon' | translate}}</th>
|
||||
</tr>
|
||||
<tr ng-repeat="charge in loanaccountinfo.overdueCharges">
|
||||
<td>{{charge.name}},{{charge.currency.displaySymbol}}</td>
|
||||
<td>{{charge.chargeCalculationType.value}}</td>
|
||||
<td>{{charge.amount}}</td>
|
||||
<td>{{charge.chargeTimeType.value}}</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<label><strong>{{ 'label.heading.collaterals' | translate }}</strong></label>
|
||||
<select ng-model="collateralFormData.collateralIdTemplate" class="form-control width170px"
|
||||
ng-options="collateralTemplate.name for collateralTemplate in collateralOptions"
|
||||
value="{{collateralTemplate.id}}">
|
||||
</select>
|
||||
<input class="form-control" type="text" ng-model="collateralFormData.collateralValueTemplate"
|
||||
placeholder="{{'label.input.value' | translate}}">
|
||||
<input type="text" ng-model="collateralFormData.collateralDescriptionTemplate" class="form-control"
|
||||
placeholder="{{'label.input.description' | translate}}">
|
||||
<a ng-click="addCollateral()"> <i class="icon-plus icon-white"></i></a>
|
||||
<label><strong>{{ 'label.heading.overduepenalitycharge' | translate }}</strong></label>
|
||||
<table class="table" class="width100">
|
||||
<tr class="graybg">
|
||||
<th>{{'label.heading.name' | translate}}</th>
|
||||
<th>{{'label.heading.type' | translate}}</th>
|
||||
<th>{{'label.heading.amount' | translate}}</th>
|
||||
<th>{{'label.heading.collectedon' | translate}}</th>
|
||||
</tr>
|
||||
<tr ng-repeat="charge in loanaccountinfo.overdueCharges">
|
||||
<td>{{charge.name}},{{charge.currency.displaySymbol}}</td>
|
||||
<td>{{charge.chargeCalculationType.value}}</td>
|
||||
<td>{{charge.amount}}</td>
|
||||
<td>{{charge.chargeTimeType.value}}</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<div class="col-md-12 paddedtop">
|
||||
<label><strong>{{ 'label.heading.collaterals' | translate }}</strong></label>
|
||||
<select ng-model="collateralFormData.collateralIdTemplate" class="form-control width170px"
|
||||
ng-options="collateralTemplate.name for collateralTemplate in collateralOptions"
|
||||
value="{{collateralTemplate.id}}">
|
||||
</select>
|
||||
<input class="form-control" type="text" ng-model="collateralFormData.collateralValueTemplate"
|
||||
placeholder="{{'label.input.value' | translate}}">
|
||||
<input type="text" ng-model="collateralFormData.collateralDescriptionTemplate" class="form-control"
|
||||
placeholder="{{'label.input.description' | translate}}">
|
||||
<a ng-click="addCollateral()"> <i class="icon-plus icon-white"></i></a>
|
||||
</div>
|
||||
<table class="table" class="width100" ng-show="collaterals.length>0">
|
||||
<tr class="graybg">
|
||||
<th>{{'label.heading.name' | translate}}</th>
|
||||
|
||||
@ -264,13 +264,15 @@
|
||||
</table>
|
||||
</div>
|
||||
<hr/>
|
||||
<label><strong>{{ 'label.heading.charges' | translate }}</strong></label>
|
||||
<select ng-model="chargeFormData.chargeId"
|
||||
ng-options="charge.id as (charge.name + ',' + charge.currency.displaySymbol) for charge in loanaccountinfo.chargeOptions"
|
||||
value="{{charge.id}}" class="form-control width170px">
|
||||
<option value="">{{'label.selectcharge' | translate}}</option>
|
||||
</select>
|
||||
<a ng-click="addCharge()"><i class="icon-plus icon-white"></i></a>
|
||||
<div class="col-md-12">
|
||||
<label><strong>{{ 'label.heading.charges' | translate }}</strong></label>
|
||||
<select ng-model="chargeFormData.chargeId"
|
||||
ng-options="charge.id as (charge.name + ',' + charge.currency.displaySymbol) for charge in loanaccountinfo.chargeOptions"
|
||||
value="{{charge.id}}" class="form-control width170px">
|
||||
<option value="">{{'label.selectcharge' | translate}}</option>
|
||||
</select>
|
||||
<a ng-click="addCharge()"><i class="icon-plus icon-white"></i></a>
|
||||
</div>
|
||||
<table class="table" class="width100" ng-show="charges.length>0">
|
||||
<tr class="graybg">
|
||||
<th>{{'label.heading.name' | translate}}</th>
|
||||
@ -311,16 +313,18 @@
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<label><strong>{{ 'label.heading.collaterals' | translate }}</strong></label>
|
||||
<select ng-model="collateralFormData.collateralIdTemplate"
|
||||
ng-options="collateralTemplate.name for collateralTemplate in collateralOptions"
|
||||
value="{{collateralTemplate.id}}" class="form-control width170px">
|
||||
</select>
|
||||
<input class="input-sm form-control" type="text" ng-model="collateralFormData.collateralValueTemplate"
|
||||
placeholder="{{'label.input.value' | translate}}">
|
||||
<input type="text" ng-model="collateralFormData.collateralDescriptionTemplate"
|
||||
placeholder="{{'label.input.description' | translate}}" class="form-control">
|
||||
<a ng-click="addCollateral()"> <i class="icon-plus icon-white"></i></a>
|
||||
<div class="col-md-12 paddedtop">
|
||||
<label class="control-label"><strong>{{ 'label.heading.collaterals' | translate }}</strong></label>
|
||||
<select ng-model="collateralFormData.collateralIdTemplate"
|
||||
ng-options="collateralTemplate.name for collateralTemplate in collateralOptions"
|
||||
value="{{collateralTemplate.id}}" class="form-control width170px">
|
||||
</select>
|
||||
<input class="form-control" type="text" ng-model="collateralFormData.collateralValueTemplate"
|
||||
placeholder="{{'label.input.value' | translate}}">
|
||||
<input type="text" ng-model="collateralFormData.collateralDescriptionTemplate"
|
||||
placeholder="{{'label.input.description' | translate}}" class="form-control">
|
||||
<a ng-click="addCollateral()"> <i class="icon-plus icon-white"></i></a>
|
||||
</div>
|
||||
<table class="table" class="width100" ng-show="collaterals.length>0">
|
||||
<tr class="graybg">
|
||||
<th>{{'label.heading.name' | translate}}</th>
|
||||
|
||||
@ -21,29 +21,28 @@
|
||||
<div class="col-sm-3">
|
||||
<form-validate valattributeform="addholidayform" valattribute="name"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="col-sm-12 col-md-12 pull-left">
|
||||
<div>
|
||||
<label class="control-label col-sm-2">{{ 'label.input.fromdate' | translate }}<span
|
||||
class="required">*</span></label>
|
||||
<div>
|
||||
<label class="control-label col-sm-2">{{ 'label.input.fromdate' | translate }}<span
|
||||
class="required">*</span></label>
|
||||
|
||||
<div class="col-sm-3">
|
||||
<input id="fromDate" sort type="text" datepicker-pop="dd MMMM yyyy"
|
||||
ng-model="date.first" is-open="opened" min="minDat" max="'2050-06-22'" class="form-control"/>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<label class="control-label col-sm-1">{{ 'label.input.todate' | translate }}<span
|
||||
class="required">*</span></label>
|
||||
|
||||
<div class="col-sm-3">
|
||||
<input id="toDate" sort type="text" datepicker-pop="dd MMMM yyyy"
|
||||
ng-model="date.second" is-open="opened1" min="minDate" max="'2020-06-22'" class="form-control"/>
|
||||
</div>
|
||||
<div class="col-sm-3">
|
||||
<input id="fromDate" sort type="text" datepicker-pop="dd MMMM yyyy"
|
||||
ng-model="date.first" is-open="opened" min="minDat" max="'2050-06-22'" class="form-control"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<label class="control-label col-sm-1">{{ 'label.input.todate' | translate }}<span
|
||||
class="required">*</span></label>
|
||||
|
||||
<div class="col-sm-3">
|
||||
<input id="toDate" sort type="text" datepicker-pop="dd MMMM yyyy"
|
||||
ng-model="date.second" is-open="opened1" min="minDate" max="'2020-06-22'"
|
||||
class="form-control"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-2">{{ 'label.input.repaymentsheduleto' | translate }}<span
|
||||
class="required">*</span></label>
|
||||
|
||||
@ -12,8 +12,8 @@
|
||||
<i class="icon-bolt icon-2x"></i><strong>{{'label.heading.recentactivities' | translate}}</strong>
|
||||
</div>
|
||||
<hr/>
|
||||
<div class="row span">
|
||||
<div class="paddedleft120">
|
||||
<div class="row">
|
||||
<div class="">
|
||||
<span data-ng-repeat="recent in recents">
|
||||
<span class="col-md-3">
|
||||
<a class="no-decorate" href="#{{recent}}" title="{{recent}}">
|
||||
@ -31,8 +31,8 @@
|
||||
translate}}</strong>
|
||||
</div>
|
||||
<hr/>
|
||||
<div class="row span">
|
||||
<div class="paddedleft120">
|
||||
<div class="row">
|
||||
<div class="">
|
||||
<span data-ng-repeat="freq in frequent">
|
||||
<span class="col-md-3">
|
||||
<a class="no-decorate" href="#{{freq}}" title="{{freq}}">
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
<td class="blockquoteresult width60">
|
||||
<table class="width100">
|
||||
<tr>
|
||||
<td class="width100">
|
||||
<td class="width100 paddedbottom10">
|
||||
<label class="control-label">{{ 'label.input.productname' | translate }} <span
|
||||
class="required">*</span></label>
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<td class="paddedbottom10">
|
||||
<label class="control-label">{{ 'label.input.product.shortname' | translate }} <span
|
||||
class="required">*</span></label>
|
||||
|
||||
@ -42,7 +42,7 @@
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="width100">
|
||||
<td class="width100 paddedbottom10">
|
||||
<label class="control-label">{{ 'label.input.description' | translate }}</label>
|
||||
|
||||
<div class="form-inline">
|
||||
@ -51,7 +51,7 @@
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<td class="paddedbottom10">
|
||||
<label class="control-label">{{ 'label.input.fund' | translate }} </label>
|
||||
|
||||
<div class="form-inline">
|
||||
|
||||
@ -29,8 +29,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<br/>
|
||||
<hr/>
|
||||
<div>
|
||||
<div class="col-md-offset-2">
|
||||
<a href="#/viewproductmix/{{productmix.productId}}" class="btn btn-default">{{ 'label.button.cancel' | translate }}</a>
|
||||
<button id="save" type="submit" class="btn btn-primary" has-permission='UPDATE_PRODUCTMIX'>{{ 'label.button.save' | translate }}</button>
|
||||
</div>
|
||||
|
||||
@ -1,14 +1,15 @@
|
||||
<div>
|
||||
<ul class="breadcrumb">
|
||||
<li><a href="#/products">{{'label.anchor.products' | translate}}</a></li>
|
||||
<li class="active">{{'label.heading.productmix' | translate}}</li>
|
||||
<li class="active">{{'label.anchor.productmix' | translate}}</li>
|
||||
</ul>
|
||||
<div class="pull-right row">
|
||||
<div class="pull-right">
|
||||
<a href="#/addproductmix" class="btn btn-primary" has-permission='CREATE_PRODUCTMIX'><i class="icon-plus icon-white"></i>{{'label.button.add' |
|
||||
translate}}</a>
|
||||
</div>
|
||||
</div>
|
||||
<div ng-controller="ProductMixController" class="row">
|
||||
<div ng-controller="ProductMixController">
|
||||
<br>
|
||||
<table class="table">
|
||||
<thead>
|
||||
<tr class="graybg">
|
||||
|
||||
@ -1,20 +1,13 @@
|
||||
<div ng-controller="ViewProductMixController">
|
||||
<div>
|
||||
<ul class="breadcrumb">
|
||||
<li>
|
||||
<h3>
|
||||
|
||||
{{productmix.productName}}
|
||||
</h3>
|
||||
</li>
|
||||
<li>
|
||||
<i class="icon-barcode"></i>
|
||||
<small>{{ 'label.uniquelyidentifiedwithid' | translate }} {{productmix.productId}} </small>
|
||||
</li>
|
||||
<li><a href="#/products">{{'label.anchor.products' | translate}}</a></li>
|
||||
<li><a href="#/productmix">{{'label.anchor.productmix' | translate}}</a></li>
|
||||
<li class="active">{{'label.anchor.viewproductmix' | translate}}</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div>
|
||||
<div class="col-md-12 primarydiv">
|
||||
<div class="width100">
|
||||
<div class="btn-group pull-right" data-ng-hide="center.status.value == 'Closed'">
|
||||
<a href="#/editproductmix/{{productmix.productId}}" class="btn btn-primary" has-permission='UPDATE_PRODUCTMIX'><i
|
||||
class="icon-edit icon-white"></i>{{ 'label.button.edit' | translate }}</a>
|
||||
@ -35,7 +28,7 @@
|
||||
<button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
|
||||
</div>
|
||||
</script>
|
||||
<div class="row">
|
||||
<div class="row paddedtop">
|
||||
<div class="col-sm-6 col-md-6">
|
||||
<table class="table table-striped" width="100%">
|
||||
<thead>
|
||||
@ -44,7 +37,7 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<tr data-ng-repeat="allowed in productmix.allowedProducts">
|
||||
<td width="40%">{{allowed.name}}</td>
|
||||
<td class="width40">{{allowed.name}}</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
@ -56,7 +49,7 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<tr data-ng-repeat="restricted in productmix.restrictedProducts">
|
||||
<td width="40%">{{restricted.name}}</td>
|
||||
<td class="width40">{{restricted.name}}</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
<input id="overpaidloans" type="checkbox" ng-true-value="overpaid" ng-model="formData.overpaidloans"> {{'loanStatusType.overpaid' | translate}}
|
||||
</div>
|
||||
<div class="col-sm-4">
|
||||
<input id="arrearloans" type="checkbox" ng-true-value="arrears" ng-model="formData.arrearloans" ng-disabled="true"> {{'loanStatusType.witharrears' | translate}}<br>
|
||||
<!--<input id="arrearloans" type="checkbox" ng-true-value="arrears" ng-model="formData.arrearloans" ng-disabled="true"> {{'loanStatusType.witharrears' | translate}}<br>-->
|
||||
<input id="closedloans" type="checkbox" ng-true-value="closed" ng-model="formData.closedloans"> {{'loanStatusType.closed.obligations.met' | translate}}<br>
|
||||
<input id="writeoffloans" type="checkbox" ng-true-value="writeoff" ng-model="formData.writeoffloans"> {{'loanStatusType.closed.written.off' | translate}}
|
||||
</div>
|
||||
|
||||
@ -3,95 +3,64 @@
|
||||
<li><a href="#/system">{{'label.anchor.system' | translate}}</a></li>
|
||||
<li class="active">{{'label.anchor.audit' | translate}}</li>
|
||||
</ul>
|
||||
<div class="form-inline">
|
||||
<div class="form-inline" data-ng-show="isCollapsed">
|
||||
<div class="form-group">
|
||||
<span class="input-append grpinputicons">
|
||||
<input ng-autofocus="true" autocomplete="off" typeahead-on-select="viewUser($item)"
|
||||
placeholder="{{'label.input.searchbyuser' | translate}}" type="text" ng-model="user" class="form-control input-sm"
|
||||
typeahead="users.username as users.username for users in template.appUsers | filter:$viewValue | limitTo:8"/>
|
||||
placeholder="{{'label.input.searchbyuser' | translate}}" type="text" ng-model="user"
|
||||
class="form-control"
|
||||
typeahead="users.username as users.username for users in template.appUsers | filter:$viewValue | limitTo:8"/>
|
||||
<span><button ng-click="isCollapsed = !isCollapsed" class="btn btn-default"><i
|
||||
class="icon-chevron-down"></i></button></span>
|
||||
class="icon-chevron-down"></i></button></span>
|
||||
<span><button ng-click="search()" class="btn btn-primary control" has-permission='READ_AUDIT'><i
|
||||
class="icon-search icon-white"></i></button></span>
|
||||
class="icon-search icon-white"></i></button></span>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div collapse="isCollapsed" class="blockoverlay" width="100%" style="overflow-y: scroll">
|
||||
<div class="control-group">
|
||||
<div class="controls">
|
||||
<select value="{{status.id}}" ng-model="formData.status" class="form-control"
|
||||
data-ng-options="status.id as status.processingResult | translate for status in template.processingResults">
|
||||
<option value="">--{{'label.selectstatus' | translate}}--</option>
|
||||
</select>
|
||||
</div>
|
||||
<div data-ng-hide="isCollapsed">
|
||||
<div class="form-inline">
|
||||
<input ng-autofocus="true" autocomplete="off" typeahead-on-select="viewUser($item)"
|
||||
placeholder="{{'label.input.searchbyuser' | translate}}" type="text" ng-model="user"
|
||||
class="form-control"
|
||||
typeahead="users.username as users.username for users in template.appUsers | filter:$viewValue | limitTo:8"/>
|
||||
<input type="text" sort placeholder="{{'label.input.fromdate' | translate}}"
|
||||
datepicker-pop="dd MMMM yyyy" ng-model="date.first" is-open="opened" min="minDate"
|
||||
max="'2020-06-22'" class="form-control"/>
|
||||
<input type="text" sort placeholder="{{'label.input.checkedfrom' | translate}}"
|
||||
datepicker-pop="dd MMMM yyyy" ng-model="date.third" is-open="opened2" min="minDate"
|
||||
max="'2020-06-22'" class="form-control"/>
|
||||
<select value="{{status.id}}" ng-model="formData.status" class="form-control width170px"
|
||||
data-ng-options="status.id as status.processingResult | translate for status in template.processingResults">
|
||||
<option value="">--{{'label.selectstatus' | translate}}--</option>
|
||||
</select>
|
||||
<select ng-model="formData.action" class="form-control width170px">
|
||||
<option value="">--{{'label.selectaction' | translate}}--</option>
|
||||
<option selected="selected" value="ALL">{{'label.all' | translate}}</option>
|
||||
<option ng-repeat="action in template.actionNames" value="{{action}}">{{action}}</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="control-group">
|
||||
<label class="control-label col-sm-2"></label>
|
||||
|
||||
<div class="controls">
|
||||
<input type="text" sort placeholder="{{'label.input.fromdate' | translate}}"
|
||||
datepicker-pop="dd MMMM yyyy" ng-model="date.first" is-open="opened" min="minDate"
|
||||
max="'2020-06-22'" class="form-control"/>
|
||||
</div>
|
||||
<div class="form-inline">
|
||||
<input type="text" placeholder="{{'label.input.resourceid' | translate}}"
|
||||
ng-model="formData.resourceId" class="form-control">
|
||||
<input type="text" sort placeholder="{{'label.input.todate' | translate}}" datepicker-pop="dd MMMM yyyy"
|
||||
ng-model="date.second" is-open="opened1" min="minDate" max="'2020-06-22'" class="form-control"/>
|
||||
<input type="text" sort placeholder="{{'label.input.checkedto' | translate}}"
|
||||
datepicker-pop="dd MMMM yyyy" ng-model="date.fourth" is-open="opened3" min="minDate"
|
||||
max="'2020-06-22'" class="form-control"/>
|
||||
<select ng-model="formData.entity" class="form-control width170px">
|
||||
<option value="">--{{'label.selectentity' | translate}}--</option>
|
||||
<option selected="selected" value="ALL">{{'label.all' | translate}}</option>
|
||||
<option ng-repeat="entity in template.entityNames" value="{{entity}}">{{entity}}</option>
|
||||
</select>
|
||||
<select ng-model="formData.checkedBy" class="form-control width170px">
|
||||
<option value="">--{{'label.selectchecker' | translate}}--</option>
|
||||
<option selected="selected" value="ALL">{{'label.all' | translate}}</option>
|
||||
<option ng-repeat="user in template.appUsers" value="{{user.id}}">{{user.username}}</option>
|
||||
</select>
|
||||
<span><a ng-click="search()" class="btn btn-primary control" has-permission='READ_AUDIT'><i
|
||||
class="icon-search icon-white"></i>{{'label.button.advancesearch' | translate}}</a></span>
|
||||
</div>
|
||||
<div class="control-group">
|
||||
<label class="control-label col-sm-2"></label>
|
||||
|
||||
<div class="controls">
|
||||
<input type="text" sort placeholder="{{'label.input.todate' | translate}}" datepicker-pop="dd MMMM yyyy"
|
||||
ng-model="date.second" is-open="opened1" min="minDate" max="'2020-06-22'" class="form-control"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="controls">
|
||||
<select ng-model="formData.action" class="form-control">
|
||||
<option value="">--{{'label.selectaction' | translate}}--</option>
|
||||
<option selected="selected" value="ALL">{{'label.all' | translate}}</option>
|
||||
<option ng-repeat="action in template.actionNames" value="{{action}}">{{action}}</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="controls">
|
||||
<select ng-model="formData.entity" class="form-control">
|
||||
<option value="">--{{'label.selectentity' | translate}}--</option>
|
||||
<option selected="selected" value="ALL">{{'label.all' | translate}}</option>
|
||||
<option ng-repeat="entity in template.entityNames" value="{{entity}}">{{entity}}</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-2"></label>
|
||||
|
||||
<div class="controls">
|
||||
<input type="text" placeholder="{{'label.input.resourceid' | translate}}"
|
||||
ng-model="formData.resourceId" class="form-control">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="controls">
|
||||
<select ng-model="formData.checkedBy" class="form-control">
|
||||
<option value="">--{{'label.selectchecker' | translate}}--</option>
|
||||
<option selected="selected" value="ALL">{{'label.all' | translate}}</option>
|
||||
<option ng-repeat="user in template.appUsers" value="{{user.id}}">{{user.username}}</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="controls">
|
||||
<input type="text" sort placeholder="{{'label.input.checkedfrom' | translate}}"
|
||||
datepicker-pop="dd MMMM yyyy" ng-model="date.third" is-open="opened2" min="minDate"
|
||||
max="'2020-06-22'" class="form-control"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="controls">
|
||||
<input type="text" sort placeholder="{{'label.input.checkedto' | translate}}"
|
||||
datepicker-pop="dd MMMM yyyy" ng-model="date.fourth" is-open="opened3" min="minDate"
|
||||
max="'2020-06-22'" class="form-control"/>
|
||||
</div>
|
||||
</div>
|
||||
<span><a ng-click="search()" class="btn btn-primary control" has-permission='READ_AUDIT'><i class="icon-search icon-white"></i>{{'label.button.advancesearch' | translate}}</a></span>
|
||||
</div>
|
||||
<div ng-show="displayResults">
|
||||
<div data-ng-show="flag" class="pull-right">
|
||||
|
||||
@ -3,12 +3,14 @@
|
||||
<li><a href="#/system">{{'label.anchor.system' | translate}}</a></li>
|
||||
<li class="active">{{'label.anchor.managecodes' | translate}}</li>
|
||||
</ul>
|
||||
<div class="pull-right row">
|
||||
<div class="pull-right">
|
||||
<a href="#/addcode" class="btn btn-primary" has-permission='CREATE_CODE'><i class="icon-plus icon-white"></i>{{ 'label.button.addcode' |
|
||||
translate }}</a>
|
||||
translate }}
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div data-ng-controller="CodeController" class="row">
|
||||
<div data-ng-controller="CodeController">
|
||||
<br>
|
||||
<table class="table">
|
||||
<thead>
|
||||
<tr class="graybg">
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
|
||||
<div class="col-sm-3">
|
||||
<select id="apptableName" ng-model="formData.apptableName" name="apptable" class="form-control" required>
|
||||
<option style="display:none" value="">{{'label.selectone' | translate}}</option>
|
||||
<option class="displaynone" value="">{{'label.selectone' | translate}}</option>
|
||||
<option value="m_client">{{'label.client' | translate}}</option>
|
||||
<option value="m_group">{{'label.group' | translate}}</option>
|
||||
<option value="m_center">{{'label.center' | translate}}</option>
|
||||
@ -42,7 +42,7 @@
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-2">{{ 'label.input.multirow' | translate }}</label>
|
||||
<span class="span1"></span><input type="checkbox" ng-model="formData.multiRow"/>
|
||||
<div class="form-inline col-sm-3"><input type="checkbox" ng-model="formData.multiRow"/></div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-2">{{ 'label.input.addcolumns' | translate }}<span
|
||||
@ -55,7 +55,7 @@
|
||||
</div>
|
||||
<div class="col-sm-3">
|
||||
<select name="columnType" ng-model="datatableTemplate.columnType" class="form-control" >
|
||||
<option style="display:none" value="">{{'label.selectcolumntype' | translate}}</option>
|
||||
<option class="displaynone" value="">{{'label.selectcolumntype' | translate}}</option>
|
||||
<option value="String">{{'label.string' | translate}}</option>
|
||||
<option value="Number">{{'label.number' | translate}}</option>
|
||||
<option value="Decimal">{{'label.decimal' | translate}}</option>
|
||||
@ -64,25 +64,25 @@
|
||||
<option value="Dropdown">{{'label.dropdown' | translate}}</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-sm-1">
|
||||
<a ng-click="addColumn()"><i class="icon-plus icon-white"></i></a>
|
||||
</div>
|
||||
<span ng-show="createdatatableform.columnname.$invalid || columnnameerror || columntypeerror">
|
||||
<small class="error"
|
||||
ng-show="createdatatableform.columnname.$error.req || columnnameerror || columntypeerror || rc.createdatatableform.attempted">
|
||||
{{ 'label.'+labelerror | translate }}
|
||||
</small>
|
||||
</span>
|
||||
<div class="col-sm-3">
|
||||
<a ng-click="addColumn()"><i class="icon-plus icon-white"></i></a>
|
||||
<span ng-show="createdatatableform.columnname.$invalid || columnnameerror || columntypeerror">
|
||||
<small class="error"
|
||||
ng-show="createdatatableform.columnname.$error.req || columnnameerror || columntypeerror || rc.createdatatableform.attempted">
|
||||
{{ 'label.'+labelerror | translate }}
|
||||
</small>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<table ng-show="columns.length > 0" width="100%">
|
||||
<table ng-show="columns.length > 0" class="width100">
|
||||
<tr class="form-group">
|
||||
<td width="11%">
|
||||
<td class="width11">
|
||||
<label class="control-label col-sm-2"><h4>{{ 'label.heading.columns' | translate }}</h4></label>
|
||||
</td>
|
||||
<td class="blockquoteresult">
|
||||
<table ng-show="columns.length > 0">
|
||||
<td class="blockquoteresult width86">
|
||||
<table ng-show="columns.length > 0" class="table width100">
|
||||
<thead>
|
||||
<tr class="graybg">
|
||||
<th>{{'label.heading.name' | translate}}</th>
|
||||
@ -100,7 +100,7 @@
|
||||
<td>
|
||||
<select ng-model="column.type" class="input-sm form-control"
|
||||
ng-change="updateDepenedencies($index)">
|
||||
<option style="display:none" value="">{{'label.selectcolumntype' | translate}}
|
||||
<option class="displaynone" value="">{{'label.selectcolumntype' | translate}}
|
||||
</option>
|
||||
<option value="String">{{'label.string' | translate}}</option>
|
||||
<option value="Number">{{'label.number' | translate}}</option>
|
||||
|
||||
@ -8,32 +8,36 @@
|
||||
<form name="createreportrform" novalidate="" class="well" ng-controller="CreateReportController" rc-submit="submit()">
|
||||
<api-validate></api-validate>
|
||||
<div class="form-group">
|
||||
<table width="100%">
|
||||
<table class="width100">
|
||||
<tr class="form-group">
|
||||
<td width="11%">
|
||||
<td class="width11">
|
||||
<label class="control-label col-sm-2"><h4>{{ 'label.heading.reportdetails' | translate }}</h4></label>
|
||||
</td>
|
||||
<td class="blockquoteresult" width="90%">
|
||||
<td class="blockquoteresult width86" width="90%">
|
||||
<table>
|
||||
<tr>
|
||||
<td width="30%">
|
||||
<label class="control-label col-sm-2">{{ 'label.input.reportname' | translate }} <span
|
||||
<td class="width30 paddedbottom10">
|
||||
<label class="control-label">{{ 'label.input.reportname' | translate }} <span
|
||||
class="required">*</span></label>
|
||||
<input id="reportName" type="text" name="reportName" ng-model="formData.reportName"
|
||||
required late-Validate/>
|
||||
<form-validate valattributeform="createreportrform" valattribute="reportName"/>
|
||||
|
||||
<div class="form-inline">
|
||||
<input id="reportName" type="text" name="reportName" ng-model="formData.reportName"
|
||||
class="form-control"
|
||||
required late-Validate/>
|
||||
<form-validate valattributeform="createreportrform" valattribute="reportName"/>
|
||||
</div>
|
||||
</td>
|
||||
<td width="20%">
|
||||
<label class="control-label col-sm-2">{{ 'label.input.reporttype' | translate }} <span
|
||||
<td class="width20 paddedbottom10">
|
||||
<label class="control-label">{{ 'label.input.reporttype' | translate }} <span
|
||||
class="required">*</span></label>
|
||||
<select id="reportType" ng-model="formData.reportType" class="input-small"
|
||||
<select id="reportType" ng-model="formData.reportType" class="form-control width170px"
|
||||
ng-options="reportType for reportType in reportdetail.allowedReportTypes"
|
||||
value="">
|
||||
</select>
|
||||
</td>
|
||||
<td width="20%">
|
||||
<label class="control-label col-sm-2">{{ 'label.input.reportsubtype' | translate }} </label>
|
||||
<select id="reportSubType" ng-model="formData.reportSubType" class="input-small"
|
||||
<td class="width20 paddedbottom10">
|
||||
<label class="control-label">{{ 'label.input.reportsubtype' | translate }} </label>
|
||||
<select id="reportSubType" ng-model="formData.reportSubType" class="form-control width170px"
|
||||
ng-options="reportSubType for reportSubType in reportdetail.allowedReportSubTypes"
|
||||
value="">
|
||||
<option value="">{{'label.selectone' | translate}}</option>
|
||||
@ -41,39 +45,40 @@
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td width="30%">
|
||||
<label class="control-label col-sm-2">{{ 'label.input.reportcategory' | translate
|
||||
<td class="width30 paddedbottom10">
|
||||
<label class="control-label">{{ 'label.input.reportcategory' | translate
|
||||
}} </label>
|
||||
<input id="reportCategory" type="text" ng-model="formData.reportCategory">
|
||||
|
||||
<div class="form-inline">
|
||||
<input id="reportCategory" type="text" class="form-control" ng-model="formData.reportCategory">
|
||||
</div>
|
||||
</td>
|
||||
<td width="20%">
|
||||
<td class="width20">
|
||||
</td>
|
||||
<td width="20%">
|
||||
<label class="control-label col-sm-2">{{ 'label.input.userreportui' | translate }}</label>
|
||||
<label class="checkbox">
|
||||
<td class="width20 paddedbottom10">
|
||||
<label class="control-label">{{ 'label.input.userreportui' | translate }}</label>
|
||||
<label class="checkbox margintopminustenpx">
|
||||
<input type="checkbox" ng-model="formData.useReport" ng-true-value="true"
|
||||
ng-false-value="false">
|
||||
</label>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td width="30%">
|
||||
<label class="control-label col-sm-2">{{ 'label.input.description' | translate }}</label>
|
||||
<textarea id="description" rows="2" ng-model="formData.description"></textarea>
|
||||
</td>
|
||||
<td width="20%">
|
||||
</td>
|
||||
<td width="20%">
|
||||
<td class="width30 paddedbottom10">
|
||||
<label class="control-label">{{ 'label.input.description' | translate }}</label>
|
||||
<div class="form-inline">
|
||||
<textarea id="description" class="form-control" rows="2" ng-model="formData.description"></textarea>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr class="span2"></tr>
|
||||
<tr class="col-md-1 minheight30px"></tr>
|
||||
|
||||
<tr class="form-group">
|
||||
<td width="8%">
|
||||
<td class="width8">
|
||||
<div data-ng-switch on="formData.reportType">
|
||||
<div data-ng-switch-when="Pentaho"></div>
|
||||
<div data-ng-switch-default>
|
||||
@ -81,19 +86,19 @@
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
<td width="90%">
|
||||
<td class="width86">
|
||||
<div data-ng-switch on="formData.reportType">
|
||||
<div data-ng-switch-when="Pentaho">
|
||||
|
||||
</div>
|
||||
<div data-ng-switch-default>
|
||||
<div style="margin-left: -4px;" class="blockquoteresult">
|
||||
<div class="blockquoteresult">
|
||||
<table class="width100">
|
||||
<tr>
|
||||
<td>
|
||||
<label class="control-label col-sm-2">{{ 'label.input.sql' | translate }}<span
|
||||
<label class="control-label">{{ 'label.input.sql' | translate }}<span
|
||||
class="required">*</span></label>
|
||||
<textarea class="width100" id="reportSql" rows="4" name="sql" ng-model="formData.reportSql"
|
||||
<textarea class="form-control width100" id="reportSql" rows="4" name="sql" ng-model="formData.reportSql"
|
||||
required></textarea>
|
||||
<form-validate valattributeform="createreportrform" valattribute="sql"/>
|
||||
</td>
|
||||
@ -105,21 +110,21 @@
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr class="span2"></tr>
|
||||
<tr class="col-md-1 minheight30px"></tr>
|
||||
|
||||
<tr class="form-group">
|
||||
<td width="11%">
|
||||
<td class="width11">
|
||||
<label class="control-label col-sm-2"><h4>{{ 'label.heading.reportparameters' | translate }}</h4></label>
|
||||
</td>
|
||||
<td class="blockquoteresult" width="90%">
|
||||
<form>
|
||||
<select ng-model="allowedParameterId">
|
||||
<td class="blockquoteresult width86">
|
||||
<form class="form-inline">
|
||||
<select ng-model="allowedParameterId" class="form-control">
|
||||
<option value="">{{'label.selectallowedparameter' | translate}}</option>
|
||||
<option ng-repeat="allowedParameter in reportdetail.allowedParameters"
|
||||
value="{{allowedParameter.id}}">{{allowedParameter.parameterName | translate}}
|
||||
</option>
|
||||
</select>
|
||||
<a class="btn btn-primary margintopminustenpx"
|
||||
<a class="btn btn-primary"
|
||||
ng-click="parameterSelected(allowedParameterId)"><i class="icon-plus icon-white"></i>{{
|
||||
'label.button.add' | translate }}
|
||||
</a>
|
||||
@ -132,8 +137,8 @@
|
||||
</tr>
|
||||
<tr ng-repeat="reportParameter in reportParameters">
|
||||
<td>{{reportParameter.allowedParameterName | translate}}</td>
|
||||
<td width="30%">
|
||||
<input type="text" ng-model="reportParameter.reportParameterName">
|
||||
<td class="width30">
|
||||
<input type="text" class="form-control" ng-model="reportParameter.reportParameterName">
|
||||
</td>
|
||||
<td><a ng-click="deleteParameter($index)"><i class="icon-remove icon-white"></i></a></td>
|
||||
</tr>
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
|
||||
<div class="col-sm-3">
|
||||
<select id="apptableName" ng-model="formData.apptableName" class="form-control" required="required">
|
||||
<option style="display:none" value="">{{'label.selectone' | translate}}</option>
|
||||
<option class="width100" value="">{{'label.selectone' | translate}}</option>
|
||||
<option value="m_client">{{'label.client' | translate}}</option>
|
||||
<option value="m_group">{{'label.group' | translate}}</option>
|
||||
<option value="m_center">{{'label.center' | translate}}</option>
|
||||
@ -44,7 +44,7 @@
|
||||
</div>
|
||||
<div class="col-sm-3">
|
||||
<select ng-model="datatableTemplate.columnType" class="form-control">
|
||||
<option style="display:none" value="">{{'label.selectcolumntype' | translate}}</option>
|
||||
<option class="width100" value="">{{'label.selectcolumntype' | translate}}</option>
|
||||
<option value="string">{{'label.string' | translate}}</option>
|
||||
<option value="number">{{'label.number' | translate}}</option>
|
||||
<option value="decimal">{{'label.decimal' | translate}}</option>
|
||||
@ -65,23 +65,23 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<table ng-show="columns.length > 0" width="100%">
|
||||
<table ng-show="columns.length > 0" class="width100">
|
||||
<tr class="form-group">
|
||||
<td width="11%">
|
||||
<td class="width11">
|
||||
<label class="control-label col-sm-2"><h4>{{ 'label.heading.columns' | translate }}</h4></label>
|
||||
</td>
|
||||
<td class="blockquoteresult" width="89%">
|
||||
<table ng-show="columns.length > 0">
|
||||
<td class="blockquoteresult width86">
|
||||
<table ng-show="columns.length > 0" class="table width100">
|
||||
<thead>
|
||||
<tr class="graybg">
|
||||
<th>{{'label.heading.name' | translate}}</th>
|
||||
<th>{{'label.heading.newname' | translate}}</th>
|
||||
<th>{{'label.heading.type' | translate}}</th>
|
||||
<th>{{'label.heading.mandatory' | translate}}</th>
|
||||
<th>{{'label.heading.length' | translate}}</th>
|
||||
<th>{{'label.heading.code' | translate}}</th>
|
||||
<th>{{'label.heading.newcode' | translate}}</th>
|
||||
<th>{{'label.heading.actions' | translate}}</th>
|
||||
<th class="paddedleft0">{{'label.heading.newname' | translate}}</th>
|
||||
<th class="paddedleft0">{{'label.heading.type' | translate}}</th>
|
||||
<th class="paddedleft0">{{'label.heading.mandatory' | translate}}</th>
|
||||
<th class="paddedleft0">{{'label.heading.length' | translate}}</th>
|
||||
<th class="paddedleft0">{{'label.heading.code' | translate}}</th>
|
||||
<th class="paddedleft0">{{'label.heading.newcode' | translate}}</th>
|
||||
<th class="paddedleft0">{{'label.heading.actions' | translate}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@ -91,15 +91,15 @@
|
||||
placeholder="{{'label.input.columnname' | translate}}"
|
||||
ng-readonly="column.originalName"/>
|
||||
</td>
|
||||
<td>
|
||||
<td class="paddedleft0">
|
||||
<input ng-model="column.newName" class="input-sm form-control" type="text"
|
||||
placeholder="{{'label.input.columnname' | translate}}"
|
||||
ng-show="column.originalName"/>
|
||||
</td>
|
||||
<td>
|
||||
<td class="paddedleft0">
|
||||
<select ng-model="column.type" required="required" class="input-sm form-control"
|
||||
ng-disabled="column.originalName" ng-change="updateDepenedencies($index)">
|
||||
<option style="display:none" value="">{{'label.selectcolumntype' | translate}}
|
||||
<option class="displaynone" value="">{{'label.selectcolumntype' | translate}}
|
||||
</option>
|
||||
<option value="string">{{'label.string' | translate}}</option>
|
||||
<option value="number">{{'label.number' | translate}}</option>
|
||||
@ -109,23 +109,23 @@
|
||||
<option value="dropdown">{{'label.dropdown' | translate}}</option>
|
||||
</select>
|
||||
</td>
|
||||
<td align="center"><input ng-model="column.mandatory" type="checkbox"/></td>
|
||||
<td>
|
||||
<td align="center" class="paddedleft0"><input ng-model="column.mandatory" type="checkbox"/></td>
|
||||
<td class="paddedleft0">
|
||||
<input ng-show="column.type == 'string'" ng-model="column.length" type="text"
|
||||
class="input-sm form-control"/>
|
||||
</td>
|
||||
<td>
|
||||
<td class="paddedleft0">
|
||||
<select ng-show="column.type == 'dropdown'" ng-model="column.code"
|
||||
ng-options="code.name as code.name for code in codes" value="{{code.name}}"
|
||||
class="input-sm form-control" ng-disabled="column.originalName"/>
|
||||
</td>
|
||||
<td>
|
||||
<td class="paddedleft0">
|
||||
<select ng-show="column.type == 'dropdown'" ng-disabled="!column.originalName"
|
||||
ng-model="column.newCode"
|
||||
ng-options="code.name as code.name for code in codes" value="{{code.name}}"
|
||||
class="input-sm form-control"/>
|
||||
</td>
|
||||
<td align="center"><a ng-click="removeColumn($index)"><i
|
||||
<td class="paddedleft0" align="center"><a ng-click="removeColumn($index)"><i
|
||||
class="icon-remove icon-white"></i></a></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
||||
@ -8,32 +8,36 @@
|
||||
<form name="editreportrform" novalidate="" class="well" ng-controller="EditReportController" rc-submit="submit()">
|
||||
<api-validate></api-validate>
|
||||
<div class="form-group">
|
||||
<table width="100%">
|
||||
<table class="width100">
|
||||
<tr class="form-group">
|
||||
<td width="10%">
|
||||
<td class="width10">
|
||||
<label class="control-label col-sm-2"><h4>{{ 'label.heading.reportdetails' | translate }}</h4></label>
|
||||
</td>
|
||||
<td class="blockquoteresult" width="90%">
|
||||
<td class="blockquoteresult width86">
|
||||
<table>
|
||||
<tr>
|
||||
<td width="30%">
|
||||
<label class="control-label col-sm-2">{{ 'label.input.reportname' | translate }} <span
|
||||
<td class="width30 paddedbottom10">
|
||||
<label class="control-label">{{ 'label.input.reportname' | translate }} <span
|
||||
class="required">*</span></label>
|
||||
<input id="reportName" type="text" name="reportName" ng-model="reportdetail.reportName"
|
||||
required late-Validate/>
|
||||
<form-validate valattributeform="editreportrform" valattribute="reportName"/>
|
||||
|
||||
<div class="form-inline">
|
||||
<input id="reportName" type="text" name="reportName" class="form-control"
|
||||
ng-model="reportdetail.reportName"
|
||||
required late-Validate/>
|
||||
<form-validate valattributeform="editreportrform" valattribute="reportName"/>
|
||||
</div>
|
||||
</td>
|
||||
<td width="20%">
|
||||
<label class="control-label col-sm-2">{{ 'label.input.reporttype' | translate }} <span
|
||||
<td class="width20 paddedbottom10">
|
||||
<label class="control-label">{{ 'label.input.reporttype' | translate }} <span
|
||||
class="required">*</span></label>
|
||||
<select id="reportType" ng-model="reportdetail.reportType" class="input-small"
|
||||
<select id="reportType" ng-model="reportdetail.reportType" class="form-control width170px"
|
||||
ng-options="reportType for reportType in reportdetail.allowedReportTypes"
|
||||
value="">
|
||||
</select>
|
||||
</td>
|
||||
<td width="20%">
|
||||
<label class="control-label col-sm-2">{{ 'label.input.reportsubtype' | translate }} </label>
|
||||
<select ng-model="reportdetail.reportSubType" class="input-small"
|
||||
<td class="width20 paddedbottom10">
|
||||
<label class="control-label">{{ 'label.input.reportsubtype' | translate }} </label>
|
||||
<select ng-model="reportdetail.reportSubType" class="form-control width170px"
|
||||
ng-options="reportSubType for reportSubType in reportdetail.allowedReportSubTypes"
|
||||
value="">
|
||||
<option value="">{{'label.selectone' | translate}}</option>
|
||||
@ -41,36 +45,43 @@
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td width="30%">
|
||||
<label class="control-label col-sm-2">{{ 'label.input.reportcategory' | translate
|
||||
<td class="width30 paddedbottom10">
|
||||
<label class="control-label">{{ 'label.input.reportcategory' | translate
|
||||
}} </label>
|
||||
<input type="text" ng-model="reportdetail.reportCategory">
|
||||
<div class="form-inline">
|
||||
<input type="text" class="form-control" ng-model="reportdetail.reportCategory">
|
||||
</div>
|
||||
</td>
|
||||
<td width="20%">
|
||||
<td class="width20 paddedbottom10">
|
||||
</td>
|
||||
<td width="20%">
|
||||
<label class="control-label col-sm-2">{{ 'label.input.userreportui' | translate }}</label>
|
||||
<input type="checkbox" ng-model="formData.useReport">
|
||||
<td class="width20 paddedbottom10">
|
||||
<label class="control-label">{{ 'label.input.userreportui' | translate }}</label>
|
||||
<div class="form-inline">
|
||||
<input type="checkbox" ng-model="formData.useReport" class="margintopminustenpx">
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td width="30%">
|
||||
<label class="control-label col-sm-2">{{ 'label.input.description' | translate }}</label>
|
||||
<textarea rows="2" ng-model="reportdetail.description"></textarea>
|
||||
<td class="width30">
|
||||
<label class="control-label">{{ 'label.input.description' | translate }}</label>
|
||||
|
||||
<div class="form-inline">
|
||||
<textarea rows="2" class="form-control" ng-model="reportdetail.description"></textarea>
|
||||
</div>
|
||||
</td>
|
||||
<td width="20%">
|
||||
<td class="width20">
|
||||
</td>
|
||||
<td width="20%">
|
||||
<td class="width20">
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr class="span2"></tr>
|
||||
<tr class="col-md-1 minheight30px"></tr>
|
||||
|
||||
<tr class="form-group">
|
||||
<td width="8%">
|
||||
<td class="width10">
|
||||
<div data-ng-switch on="formData.reportType">
|
||||
<div data-ng-switch-when="Pentaho"></div>
|
||||
<div data-ng-switch-default>
|
||||
@ -78,19 +89,19 @@
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
<td width="90%">
|
||||
<td class="width86">
|
||||
<div data-ng-switch on="formData.reportType">
|
||||
<div data-ng-switch-when="Pentaho">
|
||||
|
||||
</div>
|
||||
<div data-ng-switch-default>
|
||||
<div style="margin-left: -4px;" class="blockquoteresult">
|
||||
<div class="blockquoteresult">
|
||||
<table class="width100">
|
||||
<tr>
|
||||
<td>
|
||||
<label class="control-label col-sm-2">{{ 'label.input.sql' | translate }}<span
|
||||
<label class="control-label">{{ 'label.input.sql' | translate }}<span
|
||||
class="required">*</span></label>
|
||||
<textarea id="reportSql" class="width100" rows="4" name="sql"
|
||||
<textarea id="reportSql" class="form-control width100" rows="4" name="sql"
|
||||
ng-model="reportdetail.reportSql" required></textarea>
|
||||
<form-validate valattributeform="createreportrform" valattribute="sql"/>
|
||||
</td>
|
||||
@ -102,13 +113,13 @@
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr class="span2"></tr>
|
||||
<tr class="col-md-1 minheight30px"></tr>
|
||||
<tr class="form-group">
|
||||
<td width="10%">
|
||||
<td class="width10">
|
||||
<label class="control-label col-sm-2"><h4>{{ 'label.heading.reportparameters' | translate }}</h4></label>
|
||||
</td>
|
||||
<td class="blockquoteresult" width="90%">
|
||||
<table class="table" width="50%" ng-show="reportdetail.coreReport">
|
||||
<td class="blockquoteresult width86">
|
||||
<table class="table width100" ng-show="reportdetail.coreReport">
|
||||
<tr class="graybg">
|
||||
<th>{{'label.heading.parameter' | translate}}</th>
|
||||
<th>{{'label.heading.parameternamepassedtopentaho' | translate}}</th>
|
||||
@ -128,7 +139,7 @@
|
||||
<a class="btn btn-primary" ng-click="parameterSelected(allowedParameterId)"><i
|
||||
class="icon-plus icon-white"></i>{{ 'label.button.add' | translate }}</a>
|
||||
</form>
|
||||
<table class="table" width="50%" ng-hide="reportdetail.coreReport">
|
||||
<table class="table width100" ng-hide="reportdetail.coreReport">
|
||||
<tr class="graybg">
|
||||
<th>{{'label.heading.parameter' | translate}}</th>
|
||||
<th>{{'label.heading.parameternamepassedtopentaho' | translate}}</th>
|
||||
@ -136,7 +147,7 @@
|
||||
</tr>
|
||||
<tr ng-repeat="reportParameter in reportdetail.reportParameters">
|
||||
<td>{{reportParameter.parameterName | translate}}</td>
|
||||
<td width="30%">
|
||||
<td class="width30">
|
||||
<input type="text" ng-model="reportParameter.reportParameterName">
|
||||
</td>
|
||||
<td><a ng-click="deleteParameter($index)"><i class="icon-remove icon-white"></i></a></td>
|
||||
@ -147,7 +158,7 @@
|
||||
</table>
|
||||
</div>
|
||||
<div class="col-md-offset-6">
|
||||
<a id="cancel" class="btn btn-default" ng-click="cancel()">{{'label.button.cancel' | translate}}</a>
|
||||
<a id="cancel" class="btn btn-default" href="#/system/viewreport/{{reportdetail.id}}">{{'label.button.cancel' | translate}}</a>
|
||||
<button id="save" type="submit" class="btn btn-primary" has-permission='UPDATE_REPORT'>{{'label.button.save' | translate}}</button>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
@ -35,34 +35,26 @@
|
||||
<legend>{{ 'label.heading.datatablename' | translate }}-<strong>{{tableName}}</strong></legend>
|
||||
</fieldset>
|
||||
<div class="form-group" ng-repeat="columnHeader in columnHeaders">
|
||||
<label class="control-label col-sm-2" ng-hide="columnHeader.columnDisplayType == 'DATE'">{{ columnHeader.columnName
|
||||
}}<span ng-show="!columnHeader.isColumnNullable" class="required">*</span></label>
|
||||
<label class="control-label col-sm-3">{{ columnHeader.columnName }}
|
||||
<span ng-show="!columnHeader.isColumnNullable" class="required">*</span>
|
||||
</label>
|
||||
|
||||
<div class="col-sm-3">
|
||||
<input type="text" data-ng-show="columnHeader.columnDisplayType == 'STRING'"
|
||||
ng-model="formData[columnHeader.columnName]"/>
|
||||
<input type="text" data-ng-show="columnHeader.columnDisplayType == 'INTEGER'"
|
||||
ng-model="formData[columnHeader.columnName]"/>
|
||||
<input type="text" data-ng-show="columnHeader.columnDisplayType == 'TEXT'"
|
||||
ng-model="formData[columnHeader.columnName]"/>
|
||||
<select ng-show="columnHeader.columnDisplayType == 'CODELOOKUP'"
|
||||
<input ng-show="fieldType(columnHeader.columnDisplayType) == 'TEXT'" type="text"
|
||||
ng-model="formData[columnHeader.columnName]" class="form-control"/>
|
||||
<input ng-show="fieldType(columnHeader.columnDisplayType) == 'DATE'" type="text"
|
||||
datepicker-pop="dd MMMM yyyy" ng-model="formDat[columnHeader.columnName]"
|
||||
is-open="opened{{$index}}" class="form-control"/>
|
||||
<select ng-show="fieldType(columnHeader.columnDisplayType) == 'SELECT'"
|
||||
ng-model="formData[columnHeader.columnName]"
|
||||
ng-options="columnValue.id as columnValue.value for columnValue in columnHeader.columnValues"
|
||||
value="{{columnValue.id}}">
|
||||
value="{{columnValue.id}}" class="form-control">
|
||||
<option value="">{{'label.selectone' | translate}}</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group" ng-repeat="columnHeader in columnHeaders">
|
||||
<label class="control-label col-sm-2" ng-show="columnHeader.columnDisplayType == 'DATE'">{{ columnHeader.columnName
|
||||
}}<span ng-show="!columnHeader.isColumnNullable" class="required">*</span></label>
|
||||
|
||||
<div class="col-sm-3">
|
||||
<input ng-show="columnHeader.columnDisplayType == 'DATE'" type="text" datepicker-pop="dd MMMM yyyy"
|
||||
ng-model="formDat[columnHeader.columnName]" is-open="opened"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-offset-2">
|
||||
<div class="col-md-offset-3">
|
||||
<a id="cancel" class="btn btn-default" ng-click="cancel()">{{ 'label.button.cancel' | translate }}</a>
|
||||
<button id="save" type="submit" has-permission='UPDATE_DATATABLE' class="btn btn-primary">{{ 'label.button.save' | translate }}</button>
|
||||
</div>
|
||||
|
||||
@ -10,59 +10,62 @@
|
||||
<div class="row">
|
||||
<div class="col-sm-9 col-md-9">
|
||||
<div class="row">
|
||||
<div class="col-sm-4 col-md-4">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-2">{{ 'label.input.entity' | translate }} </label>
|
||||
<select id="entity" ng-model="formData.entity" class="input-sm form-control"
|
||||
ng-options="entity.id as entity.name for entity in template.entities"
|
||||
value="{{entity.id}}" ng-change="entityChange(formData.entity)"> </select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-4 col-md-4 col-md-offset-1">
|
||||
<div class="form-group">
|
||||
<label class="control-label">{{ 'label.input.type' | translate }} </label>
|
||||
<select id="type" ng-model="formData.type" class="input-sm form-control"
|
||||
ng-options="type.id as type.name for type in template.types"
|
||||
value="{{type.id}}"> </select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-4 col-md-4">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-sm-12">{{ 'label.input.templatename' | translate }} </label>
|
||||
<input id="name" type="text" ng-model="formData.name" class="form-control">
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-4 col-md-4">
|
||||
<div class="form-group">
|
||||
<label class="control-label">{{ 'label.input.entity' | translate }} </label>
|
||||
|
||||
<select id="entity" ng-model="formData.entity" class="form-control"
|
||||
ng-options="entity.id as entity.name for entity in template.entities"
|
||||
value="{{entity.id}}" ng-change="entityChange(formData.entity)"> </select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-4 col-md-4">
|
||||
<div class="form-group">
|
||||
<label class="control-label">{{ 'label.input.type' | translate }} </label>
|
||||
<select id="type" ng-model="formData.type" class="form-control"
|
||||
ng-options="type.id as type.name for type in template.types"
|
||||
value="{{type.id}}"> </select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-sm-4 col-md-4">
|
||||
<div class="form-group">
|
||||
<label class="control-label">{{ 'label.input.templatename' | translate }} </label>
|
||||
<input id="name" type="text" ng-model="formData.name" class="form-control">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<button class="btn input-large" ng-click="advanceOptionClick()">{{'label.button.advancedoptions' |
|
||||
translate}}
|
||||
</button>
|
||||
<table width="50%" ng-show="advanceOption=='true'" ng-repeat="mapper in mappers">
|
||||
<table class="width100" ng-show="advanceOption=='true'" ng-repeat="mapper in mappers">
|
||||
<tr ng-show="mapper.defaultAddIcon == 'true'">
|
||||
<td width="8%">
|
||||
<td class="width8">
|
||||
<label class="control-label col-sm-12">{{ 'label.input.mapperkey' | translate }} </label>
|
||||
<input type="text" class="input-sm form-control" ng-model="mapper.mapperskey">
|
||||
</td>
|
||||
<td width="15%">
|
||||
<td class="width20">
|
||||
<label class="control-label col-sm-12">{{ 'label.input.mappervalue' | translate }} </label>
|
||||
<input type="text" class="input-sm form-control" ng-model="mapper.mappersvalue">
|
||||
</td>
|
||||
<td width="15%">
|
||||
<td class="width8">
|
||||
<button class="btn marginbuttontop25px" ng-click="addMapperKeyValue()">
|
||||
<i class="icon-plus icon-white"></i>
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
<tr ng-hide="mapper.defaultAddIcon == 'true'">
|
||||
<td width="8%">
|
||||
<td class="width8">
|
||||
<label class="control-label col-sm-12">{{ 'label.input.mapperkey' | translate }} </label>
|
||||
<input type="text" class="input-sm form-control" ng-model="mapper.mapperskey">
|
||||
</td>
|
||||
<td width="15%">
|
||||
<td class="width20">
|
||||
<label class="control-label col-sm-12">{{ 'label.input.mappervalue' | translate }} </label>
|
||||
<input type="text" class="input-sm form-control" ng-model="mapper.mappersvalue"`>
|
||||
</td>
|
||||
<td width="15%">
|
||||
<td class="width8">
|
||||
<button class="btn marginbuttontop25px" ng-click="deleteMapperKeyValue($index)">
|
||||
<i class="icon-minus icon-white"></i>
|
||||
</button>
|
||||
|
||||
@ -9,29 +9,31 @@
|
||||
<api-validate></api-validate>
|
||||
<form class="well">
|
||||
<fieldset>
|
||||
<div>
|
||||
<div class="row">
|
||||
<div class="col-sm-9 col-md-9">
|
||||
<div class="row">
|
||||
<div class="col-sm-4 col-md-4">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-2">{{ 'label.input.entity' | translate }} </label>
|
||||
<select id="entity" ng-model="formData.entity" class="input-sm form-control"
|
||||
<label class="control-label">{{ 'label.input.entity' | translate }} </label>
|
||||
<select id="entity" ng-model="formData.entity" class="form-control"
|
||||
ng-options="entity.id as entity.name for entity in template.entities"
|
||||
value="{{entity.id}}" ng-change="entityChange(formData.entity)"> </select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-4 col-md-4 col-md-offset-1">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-2">{{ 'label.input.type' | translate
|
||||
<label class="control-label">{{ 'label.input.type' | translate
|
||||
}} </label>
|
||||
<select id="type" ng-model="formData.type" class="input-sm form-control"
|
||||
<select id="type" ng-model="formData.type" class="form-control"
|
||||
ng-options="type.id as type.name for type in template.types"
|
||||
value="{{type.id}}"> </select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-4 col-md-4">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-12">{{ 'label.input.templatename' | translate
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-sm-4 col-md-4">
|
||||
<div class="form-group">
|
||||
<label class="control-label">{{ 'label.input.templatename' | translate
|
||||
}} </label>
|
||||
<input id="name" type="text" ng-model="formData.name" class="form-control"/>
|
||||
</div>
|
||||
@ -41,34 +43,34 @@
|
||||
<button class="btn input-large" ng-click="advanceOptionClick()">{{'label.button.advancedoptions'
|
||||
| translate}}
|
||||
</button>
|
||||
<table width="50%" ng-show="advanceOption=='true'" ng-repeat="mapper in mappers">{{mapper}}
|
||||
<table class="width100" ng-show="advanceOption=='true'" ng-repeat="mapper in mappers">{{mapper}}
|
||||
<tr ng-show="mapper.defaultAddIcon == 'true'">
|
||||
<td width="8%">
|
||||
<td class="width8">
|
||||
<label class="control-label col-sm-12">{{ 'label.input.mapperkey' | translate }} </label>
|
||||
<input type="text" class="input-sm form-control" ng-model="mapper.mapperskey">
|
||||
</td>
|
||||
<td width="15%">
|
||||
<td class="width20">
|
||||
<label class="control-label col-sm-12">{{ 'label.input.mappervalue' | translate
|
||||
}} </label>
|
||||
<input type="text" class="input-sm form-control" ng-model="mapper.mappersvalue">
|
||||
</td>
|
||||
<td width="15%">
|
||||
<td class="width8">
|
||||
<button class="btn marginbuttontop25px" ng-click="addMapperKeyValue()">
|
||||
<i class="icon-plus icon-white"></i>
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
<tr ng-hide="mapper.defaultAddIcon == 'true'">
|
||||
<td width="8%">
|
||||
<td class="width8">
|
||||
<label class="control-label col-sm-12">{{ 'label.input.mapperkey' | translate }} </label>
|
||||
<input type="text" class="input-sm form-control" ng-model="mapper.mapperskey">
|
||||
</td>
|
||||
<td width="15%">
|
||||
<td class="width20">
|
||||
<label class="control-label col-sm-12">{{ 'label.input.mappervalue' | translate
|
||||
}} </label>
|
||||
<input type="text" class="input-sm form-control" ng-model="mapper.mappersvalue"`>
|
||||
</td>
|
||||
<td width="15%">
|
||||
<td class="width8">
|
||||
<button class="btn marginbuttontop25px" ng-click="deleteMapperKeyValue($index)">
|
||||
<i class="icon-minus icon-white"></i>
|
||||
</button>
|
||||
|
||||
@ -6,10 +6,10 @@
|
||||
<a href="#/createtemplate" class="btn btn-primary" has-permission='CREATE_TEMPLATE'><i class="icon-plus icon-white"></i> {{
|
||||
'label.button.createtemplate' | translate }}</a>
|
||||
</div>
|
||||
</div>
|
||||
<div ng-controller="TemplateController">
|
||||
<input ng-autofocus="true" ng-model="filterText" type="text" class="span marginbottom0px form-control"
|
||||
placeholder="{{ 'label.input.filterbyname' | translate }}">
|
||||
</div>
|
||||
<div ng-controller="TemplateController">
|
||||
<table class="table">
|
||||
<thead>
|
||||
<tr class="graybg">
|
||||
|
||||
Loading…
Reference in New Issue
Block a user