+
+
+
+
+
+
+
+
+ ${filteredStamps.length}
+
+
+
+
diff --git a/src/components/stamps/stamp-replacement-table.js b/src/components/stamps/stamp-replacement-table.js
index 484156d..49d5b16 100644
--- a/src/components/stamps/stamp-replacement-table.js
+++ b/src/components/stamps/stamp-replacement-table.js
@@ -13,9 +13,17 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-import {customElement, bindable} from 'aurelia-framework';
+import {customElement, bindable, computedFrom, LogManager} from 'aurelia-framework';
+import {BindingEngine} from 'aurelia-binding';
+import {Stamps} from '../../services/stamps';
+import {Catalogues} from '../../services/catalogues';
+import {Condition} from '../../util/common-models';
-// import dataTable from 'datatables'; // eslint-disable-line no-unused-vars
+import _ from 'lodash';
+import $ from 'jquery';
+
+
+const logger = LogManager.getLogger('stamp-replacement-table');
@customElement('stamp-replacement-table')
@bindable( {
@@ -24,32 +32,97 @@ import {customElement, bindable} from 'aurelia-framework';
})
export class StampReplacementTable {
- //_dataTable;
+ model = {
+ filterCatalogueRef: -1,
+ replacementCatalogueRef: -1
+ };
+ catalogues = [];
+ filteredStamps = [];
+ editingRow = -1;
+ conditions = Condition.symbols();
+ editingCatalogueNumber;
+
static inject() {
- return [Element];
+ return [Element, BindingEngine, Catalogues, Stamps];
}
- constructor(element) {
+ constructor(element, bindingEngine, catalogues, stamps) {
this.element = element;
+ this.bindingEngine = bindingEngine;
+ this.catalogueService = catalogues;
+ this.stampsService = stamps;
+ }
+
+ stampsChanged(newList, oldList) {
+ if( newList !== oldList ) {
+ this.filterStamps();
+ }
+ }
+
+ editingRowChanged(newIndex) {
+ this.editingCatalogueNumber = this.getReplacementCatalogueNumber( this.filteredStamps[newIndex]);
+ logger.debug(this.editingCatalogueNumber);
+ _.debounce( () => {
+ $('.replacement-number-input').focus();
+ }, 250)();
}
attached( ) {
- /*this._dataTable = $(this.element).find('table').dataTable({
- data: this.stamps,
- info: false,
- paging: false,
- scrollX: false,
- scrollY: '100%',
- scrollCollapse: true,
- searching: false
- }); */
+ this.loading = true;
+ this.catalogueService.find(this.catalogueService.getDefaultSearchOptions()).then(results => {
+ this.catalogues = results.models;
+ this.loading = false;
+ });
+ this._modelSubscribers = [];
+ this._modelSubscribers.push(this.bindingEngine.propertyObserver(this, 'editingRow').subscribe(this.editingRowChanged.bind(this)));
}
detached( ) {
- /*if( this._dataTable) {
- this._dataTable.api().destroy();
- }*/
+ this._modelSubscribers.forEach(sub => {
+ sub.dispose();
+ });
+ }
+
+ filterStamps( ) {
+ this.filteredStamps.splice(0, this.filteredStamps.length);
+ let self = this;
+ _.each( this.stamps, stamp => {
+ let index = _.findIndex( stamp.catalogueNumbers, { catalogueRef: self.model.filterCatalogueRef});
+ if( index >= 0 ) {
+ let s = _.clone(stamp, true);
+ s.catalogueNumbers[index].catalogueRef = self.model.replacementCatalogueRef;
+ s.catalogueNumbers[index].replacing = true;
+ self.filteredStamps.push( s );
+ }
+ });
+ if( this.filteredStamps.length > 0 ) {
+ _.debounce( context => {
+ context.editingRow = 0;
+ })(this);
+ }
+ }
+
+ select($event, $index) {
+ this.editingRow = $index;
+ }
+
+ getCurrencyCode(cn) {
+ if( cn ) {
+ if( !cn.currencyCode ) {
+ cn.currencyCode = _.find( this.catalogues, { id: cn.catalogueRef }).code;
+ }
+ return cn.currencyCode;
+ }
+ }
+
+ getReplacementCatalogueNumber(stamp) {
+ return _.find( stamp.catalogueNumbers, {replacing: true});
+ }
+
+ @computedFrom('model.filterCatalogueRef', 'model.replacementCatalogueRef')
+ get filterReady() {
+ return ( this.model.filterCatalogueRef >= 0 && this.model.replacementCatalogueRef >= 0 );
}
}
diff --git a/src/components/stamps/stamp-replacement-table.less b/src/components/stamps/stamp-replacement-table.less
index a72f7c9..e0654f9 100644
--- a/src/components/stamps/stamp-replacement-table.less
+++ b/src/components/stamps/stamp-replacement-table.less
@@ -10,5 +10,13 @@ stamp-replacement-table {
width: 100%;
height: 100%;
overflow-y: auto;
+ tr {
+ height: 39px;
+ }
+ }
+
+ .form-control {
+ height: 28px;
+ font-size: @font-size-small;
}
}
diff --git a/src/util/common-models.js b/src/util/common-models.js
index e118a1a..ba7750f 100644
--- a/src/util/common-models.js
+++ b/src/util/common-models.js
@@ -89,7 +89,7 @@ export class Enum {
let self = this;
let symbol;
this.keys().forEach( k => {
- if( self[k].ordinal === ordinal ) {
+ if( self[k].ordinal === +ordinal ) {
symbol = self[k];
}
});
diff --git a/src/views/catalogues/catalogue-upgrade.html b/src/views/catalogues/catalogue-upgrade.html
deleted file mode 100644
index 4fef9e4..0000000
--- a/src/views/catalogues/catalogue-upgrade.html
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/views/catalogues/catalogue-upgrade.js b/src/views/catalogues/catalogue-upgrade.js
deleted file mode 100644
index 89d9c34..0000000
--- a/src/views/catalogues/catalogue-upgrade.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- Copyright 2016 Jason Drake
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-import {LogManager} from 'aurelia-framework';
-import {Router} from 'aurelia-router';
-import {SessionContext} from '../../services/session-context';
-import {Stamps} from '../../services/stamps';
-
-const logger = LogManager.getLogger('catalogue-upgrade');
-
-export class CatalogueUpgradeManager {
-
- stamps = [];
- currentFilters = [];
-
- static inject() {
- return [Router, Stamps];
- }
-
- constructor(router, stampService) {
- this.router = router;
- this.stampService = stampService;
- }
-
- attached() {
- this._searchHandle = this.processSearchRequest.bind(this);
- SessionContext.addContextListener(SessionContext.SEARCH_CHANGE, this._searchHandle );
- };
-
- detached() {
- SessionContext.removeContextListener(SessionContext.SEARCH_CHANGE, this._searchHandle );
- };
-
- processSearchRequest(data, oldData) { //eslint-disable-line no-unused-vars
- let self = this;
- let options = (!self.options) ? {} : self.options;
- if( data ) {
- options.$filter = data.serialize();
- self.currentFilters = data.flatten();
- logger.debug(self.currentFilters);
- }
- self.search(options);
- }
-
- search(options) {
- return new Promise((resolve, reject) => {
- //var opts = this.options; // this.buildOptions();
- //this.stampService.clearSelected();
- this.stampService.find(options).then(result => {
- this.router.navigate(this.router.generate('upgrade', options));
- this.processStamps(result, options);
- resolve();
- }).catch(err => {
- logger.debug(err);
- reject(err);
- });
- });
- }
-
- processStamps(result, opts) {
- this.stamps = result.models;
- console.table(opts);
- }
-
-
-}
diff --git a/src/views/catalogues/catalogue-upgrade.less b/src/views/catalogues/catalogue-upgrade.less
deleted file mode 100644
index 138bb1e..0000000
--- a/src/views/catalogues/catalogue-upgrade.less
+++ /dev/null
@@ -1,30 +0,0 @@
-@import "@@pathToTheme/@@theme/variables.less";
-
-@grid-nav-height: 55px;
-
-.stamp-replacement-main {
- height: calc(~"100% - 110px");
- position: relative;
- top: @grid-nav-height;
-
- .stamp-replacement-content {
- height: 100%;
- position: relative;
- right: 0;
- top: 0;
- bottom: 0;
- // background-color: pink;
- }
-
- .stamp-replacement-search {
- height: 100%;
- position: relative;
- left: 0;
- top: 0;
- bottom: 0;
- padding-top: 2 * @padding-large-vertical;
- // background-color: blue;
-
- }
-}
-
diff --git a/src/views/stamps/stamp-list.html b/src/views/stamps/stamp-list.html
index 479ed32..df3c1c9 100644
--- a/src/views/stamps/stamp-list.html
+++ b/src/views/stamps/stamp-list.html
@@ -3,6 +3,7 @@
+
@@ -46,16 +47,19 @@