Fix #2899 Inconsistency in the UI of the app (#2902)

Co-authored-by: Shreyank Byadagi <57580641+shrunk3@users.noreply.github.com>
This commit is contained in:
Abhay Chawla 2021-03-06 01:56:55 +05:30 committed by GitHub
parent e942579c1d
commit 688ff149e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 188 additions and 186 deletions

View File

@ -1,90 +1,89 @@
<div class="col-md-12">
<div class="content-container">
<ul class="breadcrumb">
<li><a href="#/accounting">{{'label.anchor.accounting' | translate}}</a></li>
<li><a href="#/accounting_coa">{{'label.anchor.coa' | translate}}</a></li>
<li class="active">{{'label.anchor.createglaccount' | translate}}</li>
</ul>
<form name="createglaccountingform" novalidate="" class="card form-horizontal well"
ng-controller="AccCreateGLAccountController" rc-submit="submit()">
<api-validate></api-validate>
<fieldset>
<legend>{{'label.heading.createglaccount' | translate}}</legend>
<div class="form-group">
<label class="control-label col-sm-2 " for="type">{{'label.input.accounttype' | translate}}
</label>
<div class="col-sm-2">
<select id="type" ng-model="formData.type" class="form-control"
ng-options="accountType.id as accountType.code | translate for accountType in accountTypes" value="{{accountType.id}}"
ng-change="changeType()" required="required">
</select>
</div>
<label class="control-label col-sm-4" for="parentId">{{'label.input.parent' | translate}}</label>
<div class="col-sm-2">
<select id="parentId" ng-model="formData.parentId" class="form-control"
ng-options="headerType.id as headerType.name for headerType in headerTypes"
value="{{headerType.id}}">
<option value="">{{'label.selectparent' | translate}}</option>
</select>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2 ">{{'label.input.glcode' | translate}}<span
class="required">*</span></label>
<div class="col-sm-2">
<input type="text" id="glCode" name="glCode" ng-autofocus="true" ng-model="formData.glCode" class="form-control" required
late-Validate/>
</div>
<div class="col-sm-2 ">
<form-validate valattributeform="createglaccountingform" valattribute="glCode"/>
</div>
<label class="control-label col-sm-2" >{{'label.input.accountname' | translate}}<span
class="required">*</span></label>
<div class="col-sm-2">
<input id="name" type="text" name="name"
ng-model="formData.name" class="form-control" required late-Validate/>
</div>
<div class="col-sm-2">
<form-validate valattributeform="createglaccountingform" valattribute="name"/>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2 " for="usage">{{'label.input.accountusage' | translate}}</label>
<form name="createglaccountingform" novalidate="" class="form-horizontal well"
ng-controller="AccCreateGLAccountController" rc-submit="submit()">
<api-validate></api-validate>
<fieldset>
<legend>{{'label.heading.createglaccount' | translate}}</legend>
<div class="form-group">
<label class="control-label col-sm-2 " for="type">{{'label.input.accounttype' | translate}}
</label>
<div class="col-sm-2">
<select id="type" ng-model="formData.type" class="form-control"
ng-options="accountType.id as accountType.code | translate for accountType in accountTypes" value="{{accountType.id}}"
ng-change="changeType()" required="required">
</select>
</div>
<label class="control-label col-sm-4" for="parentId">{{'label.input.parent' | translate}}</label>
<div class="col-sm-2">
<select id="parentId" ng-model="formData.parentId" class="form-control"
ng-options="headerType.id as headerType.name for headerType in headerTypes"
value="{{headerType.id}}">
<option value="">{{'label.selectparent' | translate}}</option>
</select>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2 ">{{'label.input.glcode' | translate}}<span
class="required">*</span></label>
<div class="col-sm-2">
<input type="text" id="glCode" name="glCode" ng-autofocus="true" ng-model="formData.glCode" class="form-control" required
late-Validate/>
</div>
<div class="col-sm-2 ">
<form-validate valattributeform="createglaccountingform" valattribute="glCode"/>
</div>
<label class="control-label col-sm-2" >{{'label.input.accountname' | translate}}<span
class="required">*</span></label>
<div class="col-sm-2">
<input id="name" type="text" name="name"
ng-model="formData.name" class="form-control" required late-Validate/>
</div>
<div class="col-sm-2">
<form-validate valattributeform="createglaccountingform" valattribute="name"/>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2 " for="usage">{{'label.input.accountusage' | translate}}</label>
<div class="col-sm-2">
<select id="usage" ng-model="formData.usage" class="form-control">
<option ng-repeat="usageType in usageTypes" value="{{usageType.id}}">{{''+usageType.code+'' | translate}}</option>
</select>
</div>
<label class="control-label col-sm-4 " for="tagId">{{'label.input.tag' | translate}}</label>
<div class="col-sm-2">
<select id="tagId" ng-model="formData.tagId" class="form-control"
ng-options="type.id as type.name for type in types" value="{{type.id}}">
<option value="">{{'label.selecttag' | translate}}</option>
</select> </div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" for="manualEntriesAllowed">{{'label.input.manualentriesallowed' |
translate}}</label>
<div class="col-sm-2">
<select id="usage" ng-model="formData.usage" class="form-control">
<option ng-repeat="usageType in usageTypes" value="{{usageType.id}}">{{''+usageType.code+'' | translate}}</option>
</select>
</div>
<label class="control-label col-sm-4 " for="tagId">{{'label.input.tag' | translate}}</label>
<div class="col-sm-2">
<select id="tagId" ng-model="formData.tagId" class="form-control"
ng-options="type.id as type.name for type in types" value="{{type.id}}">
<option value="">{{'label.selecttag' | translate}}</option>
</select> </div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" for="manualEntriesAllowed">{{'label.input.manualentriesallowed' |
translate}}</label>
<div class="col-sm-3">
<label class="checkbox">
<input id="manualEntriesAllowed" type="checkbox" ng-model="formData.manualEntriesAllowed">
</label>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" for="description">{{'label.input.description' | translate}}</label>
<div class="col-sm-3">
<label class="checkbox">
<input id="manualEntriesAllowed" type="checkbox" ng-model="formData.manualEntriesAllowed">
</label>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" for="description">{{'label.input.description' | translate}}</label>
<div class="col-sm-8">
<textarea id="description" name="description" ng-model="formData.description" rows="8"
cols="" class="form-control"></textarea>
</div>
</div>
<div class="col-md-offset-5">
<a id="cancel" ng-href="{{cancel}}" class="btn btn-default">{{'label.button.cancel' | translate}}</a>
<button id="save" type="submit" class="btn btn-primary" has-permission='CREATE_GLACCOUNT'>{{'label.button.save' | translate}}</button>
</div>
</fieldset>
</form>
<div class="col-sm-8">
<textarea id="description" name="description" ng-model="formData.description" rows="8"
cols="" class="form-control"></textarea>
</div>
</div>
<div class="col-md-offset-5">
<a id="cancel" ng-href="{{cancel}}" class="btn btn-default">{{'label.button.cancel' | translate}}</a>
<button id="save" type="submit" class="btn btn-primary" has-permission='CREATE_GLACCOUNT'>{{'label.button.save' | translate}}</button>
</div>
</fieldset>
</form>
</div>

View File

@ -1,14 +1,12 @@
<div ng-controller="AccEditGLAccountController" class="col-md-12">
<div>
<ul class="breadcrumb">
<li><a href="#/accounting">{{'label.anchor.accounting' | translate}}</a></li>
<li><a href="#/accounting_coa">{{'label.anchor.coa' | translate}}</a></li>
<li><a href="#/viewglaccount/{{glAccountId}}">{{formData.name}}</a></li>
<li class="active">{{'label.anchor.editglaccount' | translate}}</li>
</ul>
</div>
<div ng-controller="AccEditGLAccountController" class="content-container">
<ul class="breadcrumb">
<li><a href="#/accounting">{{'label.anchor.accounting' | translate}}</a></li>
<li><a href="#/accounting_coa">{{'label.anchor.coa' | translate}}</a></li>
<li><a href="#/viewglaccount/{{glAccountId}}">{{formData.name}}</a></li>
<li class="active">{{'label.anchor.editglaccount' | translate}}</li>
</ul>
<api-validate></api-validate>
<form name="editglaccountingform" novalidate="" class="form-horizontal well" rc-submit="submit()">
<form name="editglaccountingform" novalidate="" class="card form-horizontal well" rc-submit="submit()">
<fieldset>
<legend>{{'label.heading.editglaccount' | translate}}</legend>
<div class="form-group">

View File

@ -1,11 +1,9 @@
<div ng-controller="AccViewGLAccountContoller" class="col-md-12">
<div>
<ul class="breadcrumb">
<li><a href="#/accounting">{{'label.anchor.accounting' | translate}}</a></li>
<li><a href="#/accounting_coa">{{'label.anchor.coa' | translate}}</a></li>
<li class="active">{{glaccount.name}}</li>
</ul>
</div>
<div ng-controller="AccViewGLAccountContoller" class="content-container">
<ul class="breadcrumb">
<li><a href="#/accounting">{{'label.anchor.accounting' | translate}}</a></li>
<li><a href="#/accounting_coa">{{'label.anchor.coa' | translate}}</a></li>
<li class="active">{{glaccount.name}}</li>
</ul>
<api-validate></api-validate>
<script type="text/ng-template" id="deleteglacc.html">
<div class="modal-header silver">
@ -18,55 +16,59 @@
<button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
</div>
</script>
<div class="col-md-12 well">
<h3 class="bolder">{{glaccount.name}}
<div class="pull-right">
<div class="form-group">
<a ng-show="glaccount.usage.value == 'HEADER'" class="btn btn-primary" href="#/createglaccount?parent={{glaccount.id}}&acctype={{glaccount.type.value}}" has-permission='CREATE_GLACCOUNT'><i
class="fa fa-plus"></i>&nbsp;&nbsp;{{'label.button.addchildaccount' | translate}}</a>
<a ng-hide="glaccount.disabled" class="btn btn-danger" ng-click="changeState(glaccount.disabled)" has-permission='UPDATE_GLACCOUNT'><i
class="fa fa-lock"></i>&nbsp;&nbsp;{{'label.button.disable' | translate}}</a>
<a ng-show="glaccount.disabled" class="btn btn-primary" ng-click="changeState(glaccount.disabled)" has-permission='UPDATE_GLACCOUNT'><i
class="fa fa-unlock-alt"></i>&nbsp;&nbsp;{{'label.button.enable' | translate}}</a>
<a href="#/editglaccount/{{glaccount.id}}" class="btn btn-primary" has-permission='UPDATE_GLACCOUNT'><i class="fa fa-edit"></i>&nbsp;&nbsp;{{'label.button.edit' | translate}}</a>
<button class="btn btn-danger" ng-click="deleteGLAccount()" has-permission='DELETE_GLACCOUNT'><i class="fa fa-trash-o"></i>&nbsp;&nbsp;{{'label.button.delete' | translate}}</button>
</div>
</div>
<hr>
</h3>
<div class="col-md-6">
<table class="table table-bordered table-striped">
<tr>
<td>{{ 'label.heading.glcode' | translate }}</td>
<td>{{glaccount.glCode}}</td>
</tr>
<tr>
<td>{{ 'label.heading.acctype' | translate }}</td>
<td>{{glaccount.type.code | translate}}</td>
</tr>
<tr data-ng-show="glaccount.parentName">
<td>{{ 'label.heading.parentaccountname' | translate }}</td>
<td>{{glaccount.parentName}}</td>
</tr>
<tr data-ng-show="glaccount.tagId.name">
<td>{{ 'label.heading.tag' | translate }}</td>
<td>{{glaccount.tagId.name}}</td>
</tr>
<tr>
<td>{{ 'label.heading.accountusage' | translate }}</td>
<td>{{glaccount.usage.code | translate}}</td>
</tr>
<div class="card">
<div class="content">
<h3 class="bolder">{{glaccount.name}}
<div class="pull-right">
<div class="btn-group">
<a ng-show="glaccount.usage.value == 'HEADER'" class="btn btn-primary" href="#/createglaccount?parent={{glaccount.id}}&acctype={{glaccount.type.value}}" has-permission='CREATE_GLACCOUNT'><i
class="fa fa-lock fa fa-plus"></i>{{'label.button.addchildaccount' | translate}}</a>
<a ng-hide="glaccount.disabled" class="btn btn-primary" ng-click="changeState(glaccount.disabled)" has-permission='UPDATE_GLACCOUNT'><i
class="fa fa-lock "></i>{{'label.button.disable' | translate}}</a>
<a ng-show="glaccount.disabled" class="btn btn-primary" ng-click="changeState(glaccount.disabled)" has-permission='UPDATE_GLACCOUNT'><i
class="fa fa-unlock "></i>{{'label.button.enable' | translate}}</a>
<a href="#/editglaccount/{{glaccount.id}}" class="btn btn-primary" has-permission='UPDATE_GLACCOUNT'><i class="fa fa-edit "></i>{{'label.button.edit' | translate}}</a>
<button class="btn btn-primary" ng-click="deleteGLAccount()" has-permission='DELETE_GLACCOUNT'><i class="fa fa-trash "></i>{{'label.button.delete' | translate}}</button>
</div>
</div>
<hr>
</h3>
</div>
<div class="row">
<div class="col-md-6 col-md-offset-1">
<table class="table table-bordered table-striped">
<tr>
<td>{{ 'label.heading.glcode' | translate }}</td>
<td>{{glaccount.glCode}}</td>
</tr>
<tr>
<td>{{ 'label.heading.acctype' | translate }}</td>
<td>{{glaccount.type.code | translate}}</td>
</tr>
<tr data-ng-show="glaccount.parentName">
<td>{{ 'label.heading.parentaccountname' | translate }}</td>
<td>{{glaccount.parentName}}</td>
</tr>
<tr data-ng-show="glaccount.tagId.name">
<td>{{ 'label.heading.tag' | translate }}</td>
<td>{{glaccount.tagId.name}}</td>
</tr>
<tr>
<td>{{ 'label.heading.accountusage' | translate }}</td>
<td>{{glaccount.usage.code | translate}}</td>
</tr>
<tr>
<td class="width40">{{ 'label.heading.manualentriesallowed' | translate }}</td>
<td>{{glaccount.manualEntriesAllowed}}</td>
</tr>
<tr>
<td>{{ 'label.heading.description' | translate }}</td>
<td>{{glaccount.description}}</td>
</tr>
</table>
</div>
<tr>
<td class="width40">{{ 'label.heading.manualentriesallowed' | translate }}</td>
<td>{{glaccount.manualEntriesAllowed}}</td>
</tr>
<tr>
<td>{{ 'label.heading.description' | translate }}</td>
<td>{{glaccount.description}}</td>
</tr>
</table>
</div>
</div>
</div>
</div>

View File

@ -1,34 +1,42 @@
<div class="col-md-12" ng-controller="AdHocQueryListController">
<div class="content-container" ng-controller="AdHocQueryListController">
<ul class="breadcrumb">
<li><a href="#/organization">{{'label.anchor.organization' | translate}}</a></li>
<li class="active">{{'label.anchor.adhoc' | translate}}</li>
</ul>
<input ng-model="filterText" type="text" ng-keyup="onFilter()" class="span marginbottom0px form-control" placeholder="{{'label.input.filterbyname' | translate}}">
<a class="btn btn-primary pull-right" href="#/createadhocquery" has-permission='CREATE_ADHOC'><i class="fa fa-plus fa fa-large"></i>&nbsp;&nbsp;{{'label.anchor.createadhoc' | translate}}</a>
<table class="table">
<thead>
<tr class="graybg">
<th>{{'label.heading.queryname' | translate}}</th>
<th>{{'label.heading.query' | translate}}</th>
<th>{{'label.heading.tableaffected' | translate}}</th>
<th>{{'label.heading.email' | translate}}</th>
<th>{{'label.heading.reportrunfrequncy' | translate}}</th>
<th>{{'label.heading.isactive' | translate}}</th>
<th>{{'label.heading.createdby' | translate}}</th>
</tr>
</thead>
<tbody>
<tr class="pointer-main" ng-repeat="adhocquery in adhocquerys| orderBy:'name':reverse | filter:{name:filterText}">
<!-- <td class="pointer" data-ng-click="routeTo(aduocquery.id)">{{aduocquery.name}}</td> -->
<td class="pointer" data-ng-click="routeTo(adhocquery.id)">{{adhocquery.name}}</td>
<td class="pointer" data-ng-click="routeTo(adhocquery.id)">{{adhocquery.query}}</td>
<td class="pointer" data-ng-click="routeTo(adhocquery.id)">{{adhocquery.tableName}}</td>
<td class="pointer" data-ng-click="routeTo(adhocquery.id)">{{adhocquery.email}}</td>
<td class="pointer" data-ng-click="routeTo(adhocquery.id)">{{adhocquery.reportRunFrequency | translate}} </td>
<td class="pointer" data-ng-click="routeTo(adhocquery.id)">{{adhocquery.isActive}} </td>
<td class="pointer" data-ng-click="routeTo(adhocquery.id)">{{adhocquery.createdBy}}</td>
</tr>
</tbody>
</table>
<div class="card well">
<div class="row">
<div class="col-md-9 col-sm-9">
<input ng-model="filterText" type="text" ng-keyup="onFilter()" class="span marginbottom0px form-control" placeholder="{{'label.input.filterbyname' | translate}}">
</div>
<div class="col-md-3 col-sm-3">
<a class="btn btn-primary pull-right" href="#/createadhocquery" has-permission='CREATE_ADHOC'><i class="fa fa-plus fa fa-large"></i>{{'label.anchor.createadhoc' | translate}}</a>
</div>
</div>
<hr>
<table class="table">
<thead>
<tr class="graybg">
<th>{{'label.heading.queryname' | translate}}</th>
<th>{{'label.heading.query' | translate}}</th>
<th>{{'label.heading.tableaffected' | translate}}</th>
<th>{{'label.heading.email' | translate}}</th>
<th>{{'label.heading.reportrunfrequncy' | translate}}</th>
<th>{{'label.heading.isactive' | translate}}</th>
<th>{{'label.heading.createdby' | translate}}</th>
</tr>
</thead>
<tbody>
<tr class="pointer-main" ng-repeat="adhocquery in adhocquerys| orderBy:'name':reverse | filter:filterText">
<!-- <td class="pointer" data-ng-click="routeTo(aduocquery.id)">{{aduocquery.name}}</td> -->
<td class="pointer" data-ng-click="routeTo(adhocquery.id)">{{adhocquery.name}}</td>
<td class="pointer" data-ng-click="routeTo(adhocquery.id)">{{adhocquery.query}}</td>
<td class="pointer" data-ng-click="routeTo(adhocquery.id)">{{adhocquery.tableName}}</td>
<td class="pointer" data-ng-click="routeTo(adhocquery.id)">{{adhocquery.email}}</td>
<td class="pointer" data-ng-click="routeTo(adhocquery.id)">{{adhocquery.reportRunFrequency | translate}} </td>
<td class="pointer" data-ng-click="routeTo(adhocquery.id)">{{adhocquery.isActive}} </td>
<td class="pointer" data-ng-click="routeTo(adhocquery.id)">{{adhocquery.createdBy}}</td>
</tr>
</tbody>
</table>
</div>
</div>

View File

@ -1,10 +1,5 @@
<div class="col-md-12">
<ul class="breadcrumb">
<li><a href="#/organization">{{'label.anchor.organization' | translate}}</a></li>
<li><a href="#/adhocquery">{{'label.anchor.adhoc' | translate}}</a></li>
<li class="active">{{'label.anchor.createadhoc' | translate}}</li>
</ul>
<form name="creategadhocqueryform" novalidate="" class="form-horizontal well"
<div class="content-container">
<form name="creategadhocqueryform" novalidate="" class="card form-horizontal well"
ng-controller="CreateAdHocQueryController" rc-submit="submit()">
<api-validate></api-validate>
<fieldset>