donghuang/lemo-crm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Shaun Chyxion 2017-08-19 17:18:32 +08:00
parent 633affc036
commit 06abeb2b92
8 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/web-common/src/main/java/com/pudonghot/ambition/web/interceptor/DefaultHttpRequestInterceptor.java
View File

@ -32,7 +32,7 @@ public class DefaultHttpRequestInterceptor implements TigonHandlerInterceptor {
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
log.info("Request [{}] With Params [{}].", request.getRequestURI(), request.getParameterMap());
log.debug("Request [{}] With Params [{}].", request.getRequestURI(), request.getParameterMap());
request.setAttribute("startTime", System.currentTimeMillis());
return true;
}

1
web/app/components/ace-login.js
View File

@ -23,6 +23,7 @@ export default Ember.Component.extend({
},
didInsertElement() {
let me = this;
me._super(...arguments);
Ember.$('body').removeClass().addClass('login-layout blur-login');
},
willDestroy() {

1
web/app/components/form-footer-buttons.js
View File

@ -7,6 +7,7 @@ export default BaseComponent.extend({
form: true,
didReceiveAttrs() {
const me = this;
me._super(...arguments);
let backRouteName = me.get('backRouteName');
if (Ember.isNone(backRouteName)) {
let listRouteName = me.get('routeName').replace(/[^.]+$/, 'list');

1
web/app/components/form-input-spinner.js
View File

@ -7,6 +7,7 @@ export default BaseFormInput.extend({
max: 64,
step: 1,
didReceiveAttrs() {
this._super(...arguments);
this.getVal() || this.setVal(0);
},
didInsertElement() {

3
web/app/components/form-input.js
View File

@ -6,12 +6,15 @@ export default BaseFormInput.extend({
type: 'text',
isHidden: Ember.computed.equal('type', 'hidden'),
classNameBindings: ['isHidden:hidden'],
rows: 8,
setFilename(filename) {
let me = this;
Ember.set(me.get('model'), me.get('name'), filename);
},
didReceiveAttrs() {
let me = this;
me._super(...arguments);
let isFile = me.get('type') === 'file';
!me.get('input-class') &&
me.set('input-class', isFile ? 'col-xs-3' : 'col-xs-12 col-sm-5');

3
web/app/routes/customer-issue/edit.js
View File

@ -5,7 +5,8 @@ export default BaseEditRoute.extend({
afterModel(model) {
let me = this;
let customerId = model.customerId;
this.set('breadcrumbs',
Ember.Logger.info('edit: ', model);
me.set('breadcrumbs',
[{route: 'customer.list', params: 1, text: 'Customers'},
{route: 'customer.show', params: customerId, text: 'Customer [' + customerId + ']'},
{text: 'Edit Customer [' + customerId + '] Comment'}]);

3
web/app/templates/components/form-input.hbs
View File

@ -7,8 +7,11 @@
{{#if (eq 'file' type)}}
{{input class='col-xs-12' type='file' name=name}}
{{else if (eq 'textarea' type)}}
{{log 'text area' dataModel}}
{{textarea class='col-xs-12'
name=name
rows=rows
cols=cols
value=(mut (get dataModel name))
class='form-control'
placeholder=(if placeholder placeholder label)}}

38
web/app/templates/customer/list.hbs
View File

@ -43,20 +43,20 @@
{{sortable-th name='id' text='ID'}}
{{/if}}
{{#if tableOptions.showName}}
<th>Name</th>
<th style='min-width: 86px; max-width: 168px;'>Name</th>
{{/if}}
{{#if tableOptions.showDateAdded}}
{{#sortable-th name='dateAdded'}}
{{#sortable-th name='dateAdded' style='min-width: 102px;'}}
{{th-filter name='dateAdded' text='Added' label='Added Filter' options=model.dateAddedList}}
{{/sortable-th}}
{{/if}}
{{#if tableOptions.showYears}}
{{#sortable-th name='year'}}
{{#sortable-th name='year' style='min-width: 82px'}}
{{th-filter name='year' text='Year' label='Year Filter' options=model.latestYearList}}
{{/sortable-th}}
{{/if}}
{{#if tableOptions.showYtdSale}}
{{sortable-th name='sumYtdSales' text='Sales'}}
{{sortable-th name='sumYtdSales' text='Sales' style='min-width: 102px;'}}
{{/if}}
{{#if tableOptions.showCountryCode}}
<th>
@ -64,27 +64,27 @@
</th>
{{/if}}
{{#if tableOptions.showState}}
<th>
{{th-filter name='state' text='State' label='State Filter' options=model.stateList}}
<th style="min-width: 48px;">
{{th-filter name='state' text='State' label='State Filter' options=model.stateList}}
</th>
{{/if}}
{{#if tableOptions.showCity}}
<th>
{{th-filter name='city' text='City' label='City Filter' options=model.cityList}}
<th style="min-width: 48px;">
{{th-filter name='city' text='City' label='City Filter' options=model.cityList}}
</th>
{{/if}}
{{#if tableOptions.showMs}}
{{#sortable-th name='ms'}}
{{#sortable-th name='ms' style='min-width: 74px;'}}
{{th-filter name='ms' text='MS' label='MS Filter' options=model.msList}}
{{/sortable-th}}
{{/if}}
{{#if tableOptions.showRegion}}
{{#sortable-th name='region' text='Region'}}
{{#sortable-th name='region' text='Region' style='min-width: 100px;'}}
{{th-filter name='region' text='Region' label='Region Filter' options=model.regionList}}
{{/sortable-th}}
{{/if}}
{{#if tableOptions.showSalesperson}}
{{#sortable-th name='salesperson' text='Salesperson'}}
{{#sortable-th name='salesperson' text='Salesperson' style='min-width: 100px;'}}
{{th-filter name='salesperson' text='Slspsn' label='Salesperson Filter' options=model.salespersonList}}
{{/sortable-th}}
{{/if}}
@ -120,7 +120,7 @@
</td>
{{/if}}
{{#if tableOptions.showName}}
<td style="max-width: 168px;">
<td style="white-space: initial;">
{{it.name}}
</td>
{{/if}}
@ -143,7 +143,6 @@
{{/if}}
{{#if tableOptions.showYtdSale}}
<td>
<div>
{{#if it.sumYtdSales}}
{{#if it.expand}}
<a style="cursor: pointer;" {{action (route-action 'collapseYtdSales' it)}}>
@ -156,7 +155,6 @@
{{/if}}
{{/if}}
{{number-us it.sumYtdSales}}
</div>
</td>
{{/if}}
{{#if tableOptions.showCountryCode}}
@ -195,7 +193,7 @@
</td>
{{/if}}
{{#if tableOptions.showIssue1}}
<td style="max-width: 32px;">
<td style="max-width: 36px; white-space: initial;">
{{#if it.issue1}}
<div style="max-height: 48px; overflow: auto; cursor: pointer;">
{{issue-cell issue=it.issue1.issue}}
@ -207,13 +205,13 @@
</span>
</span>
{{#link-to 'customer-issue.edit' it.issue1.id data-rel='tooltip' title='Edit Comment'}}
<i class="ace-icon fa fa-pencil bigger-60"></i>
<i class="ace-icon fa fa-pencil bigger-120"></i>
{{/link-to}}
{{/if}}
</td>
{{/if}}
{{#if tableOptions.showIssue2}}
<td style="max-width: 32px;">
<td style="max-width: 36px; white-space: initial;">
{{#if it.issue2}}
<div style="max-height: 48px; overflow: auto; cursor: pointer;">
{{issue-cell issue=it.issue2.issue}}
@ -222,13 +220,13 @@
{{moment-format (if it.issue2.dateUpdated it.issue2.dateUpdated it.issue2.dateCreated) 'M/D/YYYY H:mm:ss'}}
</span>
{{#link-to 'customer-issue.edit' it.issue2.id class="blue" data-rel='tooltip' title='Edit Comment'}}
<i class="ace-icon fa fa-pencil bigger-60"></i>
<i class="ace-icon fa fa-pencil bigger-120"></i>
{{/link-to}}
{{/if}}
</td>
{{/if}}
{{#if tableOptions.showIssue3}}
<td style="max-width: 32px;">
<td style="max-width: 36px; white-space: initial;">
{{#if it.issue3}}
<div style="max-height: 48px; overflow: auto; cursor: pointer;">
{{issue-cell issue=it.issue3.issue}}
@ -237,7 +235,7 @@
{{moment-format (if it.issue3.dateUpdated it.issue3.dateUpdated it.issue3.dateCreated) 'M/D/YYYY H:mm:ss'}}
</span>
{{#link-to 'customer-issue.edit' it.issue3.id class="blue" data-rel='tooltip' title='Edit Comment'}}
<i class="ace-icon fa fa-pencil bigger-60"></i>
<i class="ace-icon fa fa-pencil bigger-120"></i>
{{/link-to}}
{{/if}}
</td>