Merge pull request #240 from crossroads/master

namrataukirde · web-flow · commit 4c7e3a8f7d07 · 2018-04-06T18:53:38.000+05:30
#AprilRelease1
diff --git a/app/controllers/items/new.js b/app/controllers/items/new.js
@@ -300,6 +300,7 @@ export default Ember.Controller.extend({
             this.send("deleteAutoGeneratedNumber");
             this.set("inventoryNumber", "");
           }
+          window.localStorage.setItem("isSelectLocationPreviousRoute", false);
           this.send("deleteUnusedImage");
           this.set("locationId", "");
           this.set("codeId", "");
@@ -357,7 +358,7 @@ export default Ember.Controller.extend({
         this.get("messageBox").alert(this.get("i18n").t("offline_error"));
         return false;
       }
-      this.set("isSelectLocationPreviousRoute", false);
+      window.localStorage.setItem("isSelectLocationPreviousRoute", false);
       this.set("isSearchCodePreviousRoute", false);
       var _this = this, loadingView;
       var itemConditions = this.getItemConditions(_this);
diff --git a/app/controllers/select_location.js b/app/controllers/select_location.js
@@ -9,6 +9,7 @@ export default searchModule.extend({
 
   actions: {
     setLocation(location) {
+      window.localStorage.setItem("isSelectLocationPreviousRoute", true);
       this.transitionToRoute("items.new", { queryParams: { locationId: location.get("id") } });
     }
   }
diff --git a/app/models/address.js b/app/models/address.js
@@ -1,6 +1,7 @@
 import Model from 'ember-data/model';
 import attr from 'ember-data/attr';
 import { belongsTo } from 'ember-data/relationships';
+import Ember from 'ember';
 
 export default Model.extend({
   flat:        attr('string'),
@@ -11,5 +12,9 @@ export default Model.extend({
   district:    belongsTo('district', { async: false }),
 
   addressableType: attr('string'),
-  addressable: belongsTo('addressable', { polymorphic: true, async: false })
+  addressable: belongsTo('addressable', { polymorphic: true, async: false }),
+
+  fullAddress: Ember.computed('flat', 'building', 'street', function() {
+    return `${this.get('flat')} ${this.get('building')} ${this.get('street')}`;
+  })
 });
diff --git a/app/models/designation.js b/app/models/designation.js
@@ -14,6 +14,7 @@ export default Model.extend({
   detailType:         attr('string'),
   detailId:           attr('number'),
   purposeDescription: attr('string'),
+  gcOrganisationId:   attr('number'),
 
   contact:            belongsTo('contact', { async: false }),
   organisation:       belongsTo('organisation', { async: false }),
diff --git a/app/routes/items/new.js b/app/routes/items/new.js
@@ -52,13 +52,15 @@ export default AuthorizeRoute.extend({
 
     if(this.get("newItemRequest")) {
       this.set("newItemRequest", false);
-      controller.set('caseNumber', "");
       controller.set('quantity', 1);
-      controller.set('length', null);
-      controller.set('width', null);
-      controller.set('height', null);
-      controller.set('selectedGrade', { name: "B", id: "B" });
-      controller.set('selectedCondition', { name: "Used", id: "U" });
+      if(window.localStorage.getItem("isSelectLocationPreviousRoute") === "false") {
+        controller.set('caseNumber', "");
+        controller.set('length', null);
+        controller.set('width', null);
+        controller.set('height', null);
+        controller.set('selectedGrade', { name: "B", id: "B" });
+        controller.set('selectedCondition', { name: "Used", id: "U" });
+      }
       var imageKey = controller.get("imageKeys");
       if(imageKey && imageKey.length && window.localStorage.isSelectLocationPreviousRoute === "true") {
         var image = this.get("store").peekAll("image").filterBy("cloudinaryId", imageKey).get("firstObject");
diff --git a/app/routes/orders/detail.js b/app/routes/orders/detail.js
@@ -45,8 +45,14 @@ export default getOrderRoute.extend({
   },
 
   afterModel(model) {
+    var organisation;
+    var organisationId = model.get('gcOrganisationId');
     if(model) {
       var ordersPackages = this.store.query("orders_package", {   search_by_order_id: model.get("id") });
+      if(organisationId) {
+        organisation = this.store.findRecord('gcOrganisation', organisationId);
+        this.store.pushPayload(organisation);
+      }
       this.store.pushPayload(ordersPackages);
     }
   },
diff --git a/app/routes/orders/index.js b/app/routes/orders/index.js
@@ -1,3 +1,11 @@
 import AuthorizeRoute from './../authorize';
+import AjaxPromise from 'stock/utils/ajax-promise';
 
-export default AuthorizeRoute.extend();
+export default AuthorizeRoute.extend({
+  model() {
+    return new AjaxPromise("/auth/current_user_profile", "GET", this.session.get("authToken"))
+      .then(data => {
+        this.store.pushPayload(data);
+      });
+  }
+});
diff --git a/app/templates/orders/detail.hbs b/app/templates/orders/detail.hbs
@@ -56,7 +56,7 @@
           Organisation:
         </div>
         <div class="small-8 columns">
-          {{apply-line-break (if model.isGoodCityOrder model.organisation.nameEn model.organisation.name)}}
+          {{apply-line-break (if model.isGoodCityOrder model.gcOrganisation.nameEn model.organisation.name)}}
         </div>
       </div>
 
diff --git a/config/coverage.js b/config/coverage.js
@@ -1,6 +1,6 @@
 module.exports = {
   coverageFolder: 'coverage',
   excludes: [
-    '*/routes/**/*', '*/**/router.js', "public/*/**/*"
+    '*/routes/**/*', '*/**/router.js', "public/*/**/*", '*/serializers/**/*'
   ]
 }
diff --git a/tests/acceptance/add-item-to-order-test.js b/tests/acceptance/add-item-to-order-test.js
@@ -3,14 +3,17 @@ import { module, test } from 'qunit';
 import startApp from '../helpers/start-app';
 import FactoryGuy from 'ember-data-factory-guy';
 import '../factories/designation';
+import '../factories/location';
 import { mockFindAll } from 'ember-data-factory-guy';
 
-var App, designation, item, item1, orders_package, orders_package1;
+var App, designation, item, item1, orders_package, orders_package1, location1;
 
 module('Acceptance: Add item to order', {
   beforeEach: function(){
     App = startApp({}, 2);
     designation = FactoryGuy.make("designation");
+    location1 = FactoryGuy.make("location");
+    mockFindAll('location').returns({json: {locations: [location1.toJSON({includeId: true})]}});
     var data = {"user_profile": {"id": 2, "first_name": "David", "last_name": "Dara51", "mobile": "61111111", "permission_id": 4}, "permissions": [{"id": 4, "name": "Supervisor"}]};
 
     $.mockjax({url:"/api/v1/auth/current_user_profil*",
@@ -20,7 +23,11 @@ module('Acceptance: Add item to order', {
     orders_package = FactoryGuy.make("orders_package", { state: "designated", quantity: 6, item: item, designation: designation });
     orders_package1 = FactoryGuy.make("orders_package", { state: "dispatched", quantity: 4, item: item1, designation: designation });
 
-     visit("/orders/");
+    visit("/");
+
+    andThen(function() {
+      visit("/orders/");
+    });
 
     fillIn('#searchText', designation.get("code"));
     andThen(function(){
diff --git a/tests/acceptance/order-detail-test.js b/tests/acceptance/order-detail-test.js
@@ -22,7 +22,11 @@ module('Acceptance: Order Detail', {
     $.mockjax({url:"/api/v1/auth/current_user_profil*",
       responseText: data });
 
-    visit("/orders/");
+    visit("/");
+
+    andThen(function() {
+      visit("/orders/");
+    });
 
     fillIn('#searchText', designation.get("code"));
     andThen(function(){
diff --git a/tests/acceptance/order-organisation-test.js b/tests/acceptance/order-organisation-test.js
@@ -0,0 +1,53 @@
+import Ember from 'ember';
+import { module, test } from 'qunit';
+import startApp from '../helpers/start-app';
+import '../factories/orders_package';
+import '../factories/designation';
+import '../factories/gc_organisation';
+import '../factories/item';
+import FactoryGuy from 'ember-data-factory-guy';
+import { mockFindAll } from 'ember-data-factory-guy';
+
+var App, designation, item, item1, orders_package, orders_package1, org;
+
+module('Acceptance: Order Organisation', {
+  beforeEach: function() {
+    App = startApp({}, 2);
+    org = FactoryGuy.make("gc_organisation");
+    designation = FactoryGuy.make("designation", { detailType: 'Goodcity', gcOrganisationId: org.id, gc_organisation: org });
+    item = FactoryGuy.make("item", { state: "submitted" , designation: designation});
+    item1 = FactoryGuy.make("item", { state: "submitted", quantity: 10 , designation: designation});
+    orders_package = FactoryGuy.make("orders_package", { state: "designated", quantity: 6, item: item, designation: designation });
+    orders_package1 = FactoryGuy.make("orders_package", { state: "dispatched", quantity: 4, item: item1, designation: designation });
+    var data = {"user_profile": {"id": 2, "first_name": "David", "last_name": "Dara51", "mobile": "61111111", "permission_id": 4}, "permissions": [{"id": 4, "name": "Supervisor"}]};
+
+    $.mockjax({url:"/api/v1/auth/current_user_profil*",
+      responseText: data });
+
+    visit("/");
+
+    andThen(function() {
+      visit("/orders/");
+    });
+
+    fillIn('#searchText', designation.get("code"));
+    andThen(function(){
+      click(find('ul.list li:first div.row.state_details'));
+    });
+
+    mockFindAll('designation').returns({ json: {designations: [designation.toJSON({includeId: true})], items: [item.toJSON({includeId: true}), item1.toJSON({includeId: true})], gcOrganisations: [org.toJSON({includeId: true})], orders_packages: [orders_package.toJSON({includeId: true}), orders_package1.toJSON({includeId: true})], meta: {search: designation.get('code').toString()}}});
+    mockFindAll('orders_package').returns({ json: {orders_packages: [orders_package.toJSON({includeId: true}), orders_package1.toJSON({includeId: true})]}});
+  },
+  afterEach: function() {
+    Ember.run(App, 'destroy');
+  }
+});
+
+test("Check order Organisation", function(assert) {
+  assert.expect(2);
+
+  andThen(function() {
+    assert.equal(currentPath(), "orders.detail");
+    assert.equal($('.title').text().substr(-1), org.id);
+  });
+});
diff --git a/tests/acceptance/order-search-list-test.js b/tests/acceptance/order-search-list-test.js
@@ -21,6 +21,7 @@ module('Acceptance: Order search list', {
 
     $.mockjax({url:"/api/v1/auth/current_user_profil*",
       responseText: data });
+    visit("/");
   },
   afterEach: function() {
     Ember.run(App, 'destroy');
diff --git a/tests/controller/items/index-test.js b/tests/controller/items/index-test.js
@@ -0,0 +1,28 @@
+import { test, moduleFor } from 'ember-qunit';
+import startApp from '../../helpers/start-app';
+import TestHelper from 'ember-data-factory-guy/factory-guy-test-helper';
+import Ember from 'ember';
+
+var App;
+
+moduleFor('controller:items.index', 'items.index controller', {
+  beforeEach: function() {
+    App = startApp({}, 2);
+    TestHelper.setup();
+  },
+  afterEach: function() {
+    Ember.run(function() { TestHelper.teardown(); });
+    Ember.run(App, 'destroy');
+  }
+});
+
+test('Checking for default set values', function(assert) {
+  assert.expect(1);
+
+  var ctrl = this.subject();
+
+  ctrl.set('itemSetId', "1");
+
+  assert.equal(ctrl.get('searchModelName'), "item");
+});
+
diff --git a/tests/factories/address.js b/tests/factories/address.js
@@ -0,0 +1,17 @@
+import FactoryGuy from 'ember-data-factory-guy';
+
+FactoryGuy.define('address',{
+  sequences: {
+    id: function() {
+      return Math.floor(Math.random() * 100);
+    }
+  },
+  default: {
+    id                      : FactoryGuy.generate('id'),
+    flat                    : "24",
+    building                : "Crossroads",
+    street                  : "Tai chung"
+  }
+});
+export default { };
+
diff --git a/tests/factories/designation.js b/tests/factories/designation.js
@@ -19,6 +19,7 @@ FactoryGuy.define('designation', {
     createdAt:          '12/07/2016',
     updatedAt:          '12/07/2016',
     purposeDescription: 'Test',
+    gcOrganisationId:    '',
     gc_organisation:     FactoryGuy.belongsTo('gc_organisation'),
     orders_packages:     FactoryGuy.hasMany('orders_package'),
     orders_purposes:     FactoryGuy.hasMany('orders_purpose')
diff --git a/tests/factories/gc_organisation.js b/tests/factories/gc_organisation.js
@@ -8,8 +8,8 @@ FactoryGuy.define('gc_organisation', {
     }
   },
   default: {
-    id:               FactoryGuy.generate('id'),
-    name:             'GoodCity',
+    id:                 FactoryGuy.generate('id'),
+    nameEn:             'GoodCity',
     organisationsUsers: FactoryGuy.hasMany('organisationsUser')
   }
 });
diff --git a/tests/factories/order_transport.js b/tests/factories/order_transport.js
@@ -0,0 +1,18 @@
+import FactoryGuy from 'ember-data-factory-guy';
+
+FactoryGuy.define('order_transport', {
+
+  sequences: {
+    id: function(num) {
+      return num + 150;
+    }
+  },
+  default: {
+    id:                 FactoryGuy.generate('id'),
+    gogovanOrderId:     '1',
+    gogovanTransportId: '1',
+    transportType:      'ggv',
+    vehicleType:        'self',
+    scheduledAt:         Date.now()
+  }
+});
diff --git a/tests/unit/model/address-test.js b/tests/unit/model/address-test.js
@@ -32,3 +32,11 @@ test('Relationships with other models', function(assert){
   assert.equal(relationshipWithDistrict.key, 'district');
   assert.equal(relationshipWithDistrict.kind, 'belongsTo');
 });
+
+test('check fullAddress computedProperty', function(assert){
+  assert.expect(1);
+
+  var model = this.subject({ flat: '24', building: 'Crossroads', street: 'Tai chung' });
+
+  assert.equal(model.get('fullAddress'), '24 Crossroads Tai chung');
+});
diff --git a/tests/unit/model/code-test.js b/tests/unit/model/code-test.js
@@ -29,3 +29,27 @@ test('Relationship with other models', function(assert){
   assert.equal(relationshipWithLocation.key, 'location');
   assert.equal(relationshipWithLocation.kind, 'belongsTo');
 });
+
+test('check defaultChildPackagesList computedProperty', function(assert){
+  assert.expect(1);
+
+  var model = this.subject({ code: 'BBS', defaultChildPackages: 'BBS', otherChildPackages: 'FXX' });
+
+  assert.equal(model.defaultChildPackagesList().length, 1);
+});
+
+test('check otherChildPackagesList computedProperty', function(assert){
+  assert.expect(1);
+
+  var model = this.subject({ code: 'BBS', defaultChildPackages: 'BBS', otherChildPackages: 'FXX' });
+
+  assert.equal(model.otherChildPackagesList().length, 0);
+});
+
+test('check allChildPackagesList computedProperty', function(assert){
+  assert.expect(1);
+
+  var model = this.subject({ code: 'BBS', defaultChildPackages: 'BBS', otherChildPackages: 'FXX' });
+
+  assert.equal(model.allChildPackagesList().length, 1);
+});
diff --git a/tests/unit/model/order-transport-test.js b/tests/unit/model/order-transport-test.js
@@ -0,0 +1,38 @@
+import { test, moduleForModel } from 'ember-qunit';
+
+moduleForModel('order_transport', 'Ordertransport Model', {
+  needs: ['model:contact', 'model:designation']
+});
+
+test('check attributes', function(assert){
+  var model = this.subject();
+  var gogovanOrderId = Object.keys(model.toJSON()).indexOf('gogovanOrderId') > -1;
+  var gogovanTransportId = Object.keys(model.toJSON()).indexOf('gogovanTransportId') > -1;
+  var transportType = Object.keys(model.toJSON()).indexOf('transportType') > -1;
+  var vehicleType = Object.keys(model.toJSON()).indexOf('vehicleType') > -1;
+  var scheduledAt = Object.keys(model.toJSON()).indexOf('scheduledAt') > -1;
+
+  assert.ok(gogovanOrderId);
+  assert.ok(gogovanTransportId);
+  assert.ok(transportType);
+  assert.ok(vehicleType);
+  assert.ok(scheduledAt);
+});
+
+test('scheduledDate returns date in D MM YYYY format', function(assert) {
+  assert.expect(1);
+  var order_transport = this.subject({ scheduledAt: 1520418712981 });
+  assert.equal(order_transport.get('scheduledDate'), "7 March 2018");
+});
+
+test('type returns capitalize GGV transport type', function(assert) {
+  assert.expect(1);
+  var order_transport_with_ggv = this.subject({ transportType: "ggv" });
+  assert.equal(order_transport_with_ggv.get('type'), "GGV");
+});
+
+test('type returns capitalize self transport type', function(assert) {
+  assert.expect(1);
+  var order_transport_with_self = this.subject({ transportType: "self" });
+  assert.equal(order_transport_with_self.get('type'), "Self");
+});
diff --git a/tests/unit/model/user-profile-test.js b/tests/unit/model/user-profile-test.js

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ export default searchModule.extend({`
`9`	`9`
`10`	`10`	`actions: {`
`11`	`11`	`setLocation(location) {`
	`12`	`+ window.localStorage.setItem("isSelectLocationPreviousRoute", true);`
`12`	`13`	`this.transitionToRoute("items.new", { queryParams: { locationId: location.get("id") } });`
`13`	`14`	`}`
`14`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`module.exports = {`
`2`	`2`	`coverageFolder: 'coverage',`
`3`	`3`	`excludes: [`
`4`		`- '/routes//', '//router.js', "public//*/"`
	`4`	`+ '/routes//', '//router.js', "public//*/", '/serializers//'`
`5`	`5`	`]`
`6`	`6`	`}`