From 1f298f0d73b9707e52e4068821faa3e290ff1c96 Mon Sep 17 00:00:00 2001 From: Jaredream Date: Thu, 29 Mar 2018 14:55:13 -0400 Subject: [PATCH 1/6] update the info modifaction dialog for a crossing --- package-lock.json | 110 +++++-------- package.json | 6 +- src/views/Form/index.vue | 327 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 368 insertions(+), 75 deletions(-) diff --git a/package-lock.json b/package-lock.json index 234cc1d..44ff5cd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -454,32 +454,6 @@ "babel-types": "6.26.0" } }, - "babel-helper-module-imports": { - "version": "7.0.0-beta.3", - "resolved": "https://registry.npmjs.org/babel-helper-module-imports/-/babel-helper-module-imports-7.0.0-beta.3.tgz", - "integrity": "sha512-bdPrIXbUTYfREhRhjbN8SstwQaj0S4+rW4PKi1f2Wc5fizSh0hGYkfXUdiSSOgyTydm956tAyz4FrG61bqdQyw==", - "requires": { - "babel-types": "7.0.0-beta.3", - "lodash": "4.17.4" - }, - "dependencies": { - "babel-types": { - "version": "7.0.0-beta.3", - "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-7.0.0-beta.3.tgz", - "integrity": "sha512-36k8J+byAe181OmCMawGhw+DtKO7AwexPVtsPXoMfAkjtZgoCX3bEuHWfdE5sYxRM8dojvtG/+O08M0Z/YDC6w==", - "requires": { - "esutils": "2.0.2", - "lodash": "4.17.4", - "to-fast-properties": "2.0.0" - } - }, - "to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=" - } - } - }, "babel-helper-optimise-call-expression": { "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz", @@ -573,18 +547,6 @@ "babel-runtime": "6.26.0" } }, - "babel-plugin-lodash": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/babel-plugin-lodash/-/babel-plugin-lodash-3.3.2.tgz", - "integrity": "sha512-lNsptTRfc0FTdW56O087EiKEADVEjJo2frDQ97olMjCKbRZfZPu7MvdyxnZLOoDpuTCtavN8/4Zk65x4gT+C3Q==", - "requires": { - "babel-helper-module-imports": "7.0.0-beta.3", - "babel-types": "6.26.0", - "glob": "7.1.2", - "lodash": "4.17.4", - "require-package-name": "2.0.1" - } - }, "babel-plugin-syntax-async-functions": { "version": "6.13.0", "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz", @@ -954,6 +916,7 @@ "version": "6.23.0", "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz", "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=", + "dev": true, "requires": { "babel-runtime": "6.26.0" } @@ -1059,6 +1022,7 @@ "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", + "dev": true, "requires": { "core-js": "2.5.3", "regenerator-runtime": "0.11.1" @@ -1098,6 +1062,7 @@ "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", + "dev": true, "requires": { "babel-runtime": "6.26.0", "esutils": "2.0.2", @@ -1114,7 +1079,8 @@ "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "dev": true }, "base": { "version": "0.11.2", @@ -1225,6 +1191,7 @@ "version": "1.1.8", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", + "dev": true, "requires": { "balanced-match": "1.0.0", "concat-map": "0.0.1" @@ -1865,7 +1832,8 @@ "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true }, "concat-stream": { "version": "1.6.0", @@ -1993,7 +1961,8 @@ "core-js": { "version": "2.5.3", "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz", - "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=" + "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=", + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -2912,7 +2881,8 @@ "esutils": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=" + "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", + "dev": true }, "etag": { "version": "1.8.1", @@ -3288,7 +3258,8 @@ "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true }, "fsevents": { "version": "1.1.3", @@ -4228,6 +4199,7 @@ "version": "7.1.2", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, "requires": { "fs.realpath": "1.0.0", "inflight": "1.0.6", @@ -4751,6 +4723,7 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, "requires": { "once": "1.4.0", "wrappy": "1.0.2" @@ -4759,7 +4732,8 @@ "inherits": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "dev": true }, "internal-ip": { "version": "1.2.0", @@ -5257,7 +5231,8 @@ "lodash": { "version": "4.17.4", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=" + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", + "dev": true }, "lodash.camelcase": { "version": "4.3.0", @@ -5662,6 +5637,7 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true, "requires": { "brace-expansion": "1.1.8" } @@ -6084,6 +6060,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, "requires": { "wrappy": "1.0.2" } @@ -6357,7 +6334,8 @@ "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true }, "path-is-inside": { "version": "1.0.2", @@ -8813,7 +8791,8 @@ "regenerator-runtime": { "version": "0.11.1", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", + "dev": true }, "regenerator-transform": { "version": "0.10.1", @@ -8950,11 +8929,6 @@ "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", "dev": true }, - "require-package-name": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/require-package-name/-/require-package-name-2.0.1.tgz", - "integrity": "sha1-wR6XJ2tluOKSP3Xav1+y7ww4Qbk=" - }, "requires-port": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", @@ -9832,7 +9806,8 @@ "to-fast-properties": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", - "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=" + "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", + "dev": true }, "to-object-path": { "version": "0.3.0", @@ -10408,9 +10383,9 @@ } }, "vue": { - "version": "2.5.13", - "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.13.tgz", - "integrity": "sha512-3D+lY7HTkKbtswDM4BBHgqyq+qo8IAEE8lz8va1dz3LLmttjgo0FxairO4r1iN2OBqk8o1FyL4hvzzTFEdQSEw==" + "version": "2.5.16", + "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.16.tgz", + "integrity": "sha512-/ffmsiVuPC8PsWcFkZngdpas19ABm5mh2wA7iDqcltyCTwlgZjHGeJYOXkBMo422iPwIcviOtrTCUpSfXmToLQ==" }, "vue-hot-reload-api": { "version": "2.2.4", @@ -10455,9 +10430,9 @@ } }, "vue-template-compiler": { - "version": "2.5.13", - "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.13.tgz", - "integrity": "sha512-15HWSgIxrGUcV0v7QRen2Y3fQsbgxXwMvjT/5XKMO0ANmaCcNh7y2OeIDTAuSGeosjb9+E1Pn2PHZ61VQWEgBQ==", + "version": "2.5.16", + "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.16.tgz", + "integrity": "sha512-ZbuhCcF/hTYmldoUOVcu2fcbeSAZnfzwDskGduOrnjBiIWHgELAd+R8nAtX80aZkceWDKGQ6N9/0/EUpt+l22A==", "dev": true, "requires": { "de-indent": "1.0.2", @@ -10471,12 +10446,10 @@ "dev": true }, "vue2-google-maps": { - "version": "0.8.4", - "resolved": "https://registry.npmjs.org/vue2-google-maps/-/vue2-google-maps-0.8.4.tgz", - "integrity": "sha1-TFIB+PeaVKjnxWhBZ3+j87sWAMo=", + "version": "0.8.11", + "resolved": "https://registry.npmjs.org/vue2-google-maps/-/vue2-google-maps-0.8.11.tgz", + "integrity": "sha512-dK8Ekjc2MZN7Yc60MhXu5+Kj5ItruSP+jvwzF5+d32UpTV06g5aLgmHs4riv9Kfpc4kRTQMalDaYHUFS0NxZ7g==", "requires": { - "babel-plugin-lodash": "3.3.2", - "babel-plugin-transform-runtime": "6.23.0", "babel-runtime": "5.8.38", "marker-clusterer-plus": "2.1.4" }, @@ -10497,9 +10470,9 @@ } }, "vuetify": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-1.0.5.tgz", - "integrity": "sha512-dmzYa343/g4FDDUrZRT3jfemYvhB8ltCXfqHXsICuGqEqFRjJwS1fiN8belvXyR5bDhfDpLadnEWaKQv6/lMKA==" + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-1.0.11.tgz", + "integrity": "sha512-R+wi3AnT1OCbHLhbZWlKUZmiamS+6jAy0gPTbtmRFXJOXWTV5DGMSyRWktjrpq6pxEEdEaJyGmOeurPYmnGxmg==" }, "watchpack": { "version": "1.4.0", @@ -11221,7 +11194,8 @@ "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true }, "ws": { "version": "4.0.0", diff --git a/package.json b/package.json index 0d3285b..def9efd 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,10 @@ "build": "node build/build.js" }, "dependencies": { - "vue": "^2.5.2", + "vue": "^2.5.16", "vue-router": "^3.0.1", "vue2-google-maps": "^0.8.4", - "vuetify": "^1.0.5" + "vuetify": "^1.0.11" }, "devDependencies": { "autoprefixer": "^7.1.2", @@ -46,7 +46,7 @@ "url-loader": "^0.5.8", "vue-loader": "^13.3.0", "vue-style-loader": "^3.0.1", - "vue-template-compiler": "^2.5.2", + "vue-template-compiler": "^2.5.16", "webpack": "^3.6.0", "webpack-bundle-analyzer": "^2.9.0", "webpack-dev-server": "^2.9.1", diff --git a/src/views/Form/index.vue b/src/views/Form/index.vue index bd5e4e4..f144a60 100644 --- a/src/views/Form/index.vue +++ b/src/views/Form/index.vue @@ -40,6 +40,227 @@ + + + + + +
Crossing ID: {{crossing.id}}
+ + + close + + + + + + + Long English + + + + + + Long French + + + + + + Status * + + + + + + Type * + + + + + + In Service * + + + + + + + + + + + To + + + + + + + + + + + Key Rt + + + + + + Railway + + + + + + Jurisdiction * + + + + + + Subdivision + + + + + + Mile + + + + + + Spur + + + + + + Mile + + + + + + Province * + + + + + + Region + + + + + + Latitude + + + + + + Longitude + + + + + + Nearest Muni + + + + + + Road/Hwy #Eng + + + + + + GEO Text + + + + + + Updatedby + + + + + + on + + + + + + + + + + + Memo + + + + + + + *indicates required field + + + + Close + Save + + + +
-
Crossing ID: {{ crossing.id }}
-
Type: {{ crossing.component }}
+
Crossing ID: {{ crossing.id }}
+
Type: + {{ crossing.component }} + + create + +
RSI Name: {{ crossing.RSI_Name }}
RSI Region: {{ crossing.RSI_Region }}
Maintainer: {{ crossing.railway_Maintainer }}
@@ -199,14 +425,39 @@ export default { // left drawer drawer: true, crossing: { - id: "75453", + //presented info + id: "304562", component: "AWS", last_inspect_date: "01-20-2017", RSI_Name: "Jeffrey Young", RSI_Region: "ONT", railway_Maintainer: "Richky Klein", attendign_railway_emp: "Jay Price", - address: "8731 Leuschke Roads East Audie" + address: "8731 Leuschke Roads East Audie", + //detailed info + english: "AWS: Mile 0 Mcmillan Bloedel Co Spur 23.9, Cartier Subdivision (Ottawa Valley Rail Link), Hwy 17 (Sturgeon Falls), (Y), CrossingID: 20517", + french: "", + status: "Active - Currently: In use by the Railway today", + type: "Signals - AWS (Active Warning System)", + in_service_from: "2014-06-26", + in_service_to: "NaN", + railway: "Ottawa Valley Railway", + juris: "Federal", + key_rt: "Unknown", + subdivision: "Cartier", + mile: 23.9, + spur: "Mcmillan Bloedel Co", + s_mile: 0, //in DB, this column is named "miles" + province: "Ont.", + region: "ONT", + longitude: -79.9371, + latitude: 46.3662, + road_hwy: "Hwy 17 (Sturgeon Falls)", + nearest_muni: "ON -Ministry of Transportation", + GEO_text: "NaN", + updated_by: "NaN", + updated_on: "2017-03-27", //in DB, this column is named "on" + memo: "20517", }, // pop-up dialog confirm_dialog: null, @@ -222,6 +473,74 @@ export default { "Your inspection work will be saved. You may continue later to complete the inspection." } ], + // pop-up dialog for modifying crossing info + info_dialog: null, + info_dia_items: { + english: "", + french: "", //cannot use utf-8 for French + status: null, + types: null, + inservice_from: false, + inservice_to: false, + railway: "", + juris: null, + key_rt: "", + subdivision: "", + mile: "", + spur: "", + s_mile: "", + region: null, + province: null, + lat: "", + lng: "", + nearest_muni: "", + road_hwy: "", + geo_text: "", + updatedby: "", + updated_on:false, + memo: "" + }, + // info lists + status_items: [ + 'Active - Currently: In use by the Railway today', + 'Inactive - Permanent: Change of ownership', + 'Inactive - Permanent: Crossing road apprch removed', + 'Inactive - Permanent: Railway will not use again', + 'Inactive - Permanent: Track Abandoned', + 'Inactive - Temporary: may be re-used', + ], + type_items: [ + 'Crossing (Passive)', + 'Signals - AWS (Active Warning System)', + ], + juris_items: [ + 'Federal', + 'Provincial', + ], + region_items: [ + 'ATL', + 'ONT', + 'PAC', + 'PNR', + 'QUE', + ], + province_items: [ + 'Alta.', + 'B.C.', + 'Man.', + 'N.B.', + 'N.L.', + 'N.S.', + 'N.W.T.', + 'Ont.', + 'Que.', + 'Sask.', + 'Y.T.', + ], + // date picker menu + menu_inservice_from: false, + menu_inservice_to: false, + menu_updated_on: false, // question panel transition: "slide-right", current_question: 0, From 8ead1926c1884142e62b216b774c247187ce6a29 Mon Sep 17 00:00:00 2001 From: Jaredream Date: Sat, 26 May 2018 10:00:45 +0800 Subject: [PATCH 2/6] update vue-template-compiler to 2.5.16 --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8588f3b..eb79792 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12488,9 +12488,9 @@ } }, "vue-template-compiler": { - "version": "2.5.15", - "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.15.tgz", - "integrity": "sha512-v3GRVovW8fWO01SAJ+1MbdzbCN+hVBusoqUOBE5FR9dVMGo3p/WDO2gRS/+gEgAALtL7i5pxi+V2l6EauM3XDA==", + "version": "2.5.16", + "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.16.tgz", + "integrity": "sha512-ZbuhCcF/hTYmldoUOVcu2fcbeSAZnfzwDskGduOrnjBiIWHgELAd+R8nAtX80aZkceWDKGQ6N9/0/EUpt+l22A==", "dev": true, "requires": { "de-indent": "1.0.2", diff --git a/package.json b/package.json index 63d4392..bcb6057 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "url-loader": "^0.6.2", "vue-loader": "^13.3.0", "vue-style-loader": "^3.0.3", - "vue-template-compiler": "^2.5.2", + "vue-template-compiler": "^2.5.16", "webpack": "^3.7.1", "webpack-bundle-analyzer": "^2.9.0", "webpack-dev-middleware": "^1.12.0", From e71ad87f2a428acf18f67f46d30beebbff6a252f Mon Sep 17 00:00:00 2001 From: Jaredream Date: Sun, 27 May 2018 12:07:11 +0800 Subject: [PATCH 3/6] Completed the Infomation Dialog --- src/views/Form/index.vue | 817 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 778 insertions(+), 39 deletions(-) diff --git a/src/views/Form/index.vue b/src/views/Form/index.vue index a9a5dc0..fd9bf7e 100644 --- a/src/views/Form/index.vue +++ b/src/views/Form/index.vue @@ -85,25 +85,25 @@ Long English - + Long French - + Status * - + Type * - + In Service * @@ -114,21 +114,21 @@ lazy :close-on-content-click="false" v-model="menu_inservice_from" - :return-value.sync="info_dia_items.in_service_from" + :return-value.sync="info_dia_tab1.in_service_from" > - + To @@ -139,111 +139,111 @@ lazy :close-on-content-click="false" v-model="menu_inservice_to" - :return-value.sync="info_dia_items.in_service_to" + :return-value.sync="info_dia_tab1.in_service_to" > - + Key Rt - + Railway - + Jurisdiction * - + Subdivision - + Mile - + Spur - + Mile - + Province * - + Region - + Latitude - + Longitude - + Nearest Muni - + Road/Hwy #Eng - + GEO Text - + Updatedby - + on @@ -254,27 +254,27 @@ lazy :close-on-content-click="false" v-model="menu_updated_on" - :return-value.sync="info_dia_items.on" + :return-value.sync="info_dia_tab1.on" > - + Memo - + @@ -282,6 +282,572 @@ + + + + + + + Type/TC ID: * + + + + + + / + + + + + + Access: + + + + + + Railway: + + + + + + Jurisdiction: + + + + + + Prov.: + + + + + + Subdivision: * + + + + + + + + + Key Route: + + + + + + Spur: * + + + + + + + + + GCR Appl.: + + + + + + Pedestrain Protection: + + + + + + Whis. Cess.: + + + + + + Passive Protection: + + + + + + WC Prov.: + + + + + + AWS Protection: + + + + + + WC Auth.: + + + + + + Track Circuit: + + + + + + Rd. Class 1: + + + + + + LED Lights: + + + + + + Data Recorder: + + + + + + Rd. Type: + + + + + + Road Name/Hwy#: + + + + + + Rd. Class 2: + + + + + + Road Auth. #1: + + + + + + + + + Road Auth. #2: + + + + + + + + + Exemption: + + + + + + + + + Last Inspected + + + + + + + + + + + By: + + + + + + Last Comp.A Insp + + + + + + + + + + + By: + + + + + + In Service From + + + + + + + + + + + To + + + + + + + + + + + Status: + + + + + + + *indicates required field + + + + + + + + + + #Track: + + + + + + Rail Approach: + + + + + + #Lanes: + + + + + + Raod Approach: + + + + + + Sildewalks(SW): + + + + + + Approach Surface: + + + + + + + + + + + SW for Assistive Dev.: + + + + + + Gradient SSD (Percentage): + + + + + + + + + + + Area Lighting: + + + + + + Gradient Stopped (Percentage): + + + + + + + + + + + Track Type: + + + + + + DSSD (Meters): + + + + + + + + + + + Incr. Mile Direct.: + + + + + + DStoppped (Meters): + + + + + + + + + + + Track Angle (Degree): + + + + + + Departure (Seconds): + + + + + + + + + + + Prepare to Stop Sign: + + + + + + Advance Activation (Seconds): + + + + + + + + + + + Intercon. Traffic Signal: + + + + + + Preemption Time (Seconds): + + + + + + + + + + + + + Distance to Intersections (Meters): + + + + + + + + + + + + + Clearance Distance (Meters): + + + + + + + + + + Comment for Approach Direction Column #1: + + + + + + Comment for Approach Direction Column #2: + + + + + + + + + + + + +
+

Train Traffic

+
+ + + + + + + +
+

Vehicle Traffic

+
+ + + + + + @@ -518,7 +1084,7 @@ export default { memo: '20517' }, info_dialog: null, - info_dia_items: { + info_dia_tab1: { english: '', french: '', status: null, @@ -543,6 +1109,79 @@ export default { updated_on: false, memo: '' }, + info_dia_tab2: { + typeID: null, + typeID_num: '', + access: null, + railyway: null, + juris: null, + prov: null, + sub_t: '', + sub_s: null, + keyRoute: null, + spur_t: '', + spur_s: null, + gcr: null, + pedesP: null, + whis: null, + passiveP: null, + wcProv: '', + aws: null, + wcAuth: '', + trackC: null, + rdClass1: null, + led: null, + dataR: null, + rdT: null, + rname: '', + rdClass2: null, + rAuth1: '', + private_1: '', + rAuth2: '', + private_2: '', + exemp_s: null, + exemp_t: '', + last_inspected: false, + by_inspetec: '', + last_comp: false, + by_comp: '', + status_s: null + }, + info_dia_tab3: { + track: '', + rail_app: null, + lanes: '', + road_app: null, + sw: null, + aSur1: null, + aSur2: null, + swAD: null, + ssd1: '', + ssd2: '', + al: null, + gs1: '', + gs2: '', + trackType: null, + dssd1: '', + dssd2: '', + incrDirec: null, + dstop1: '', + dstop2: '', + trackAngle: '', + depart1: '', + depart2: '', + prepareStop: null, + aActivation1: '', + aActivation2: '', + intercon: null, + preemp1: '', + preemp2: '', + disIntersection1: '', + disIntersection2: '', + clearDis: '', + comment1: '', + comment2: '' + }, // info lists status_items: [ 'Active - Currently: In use by the Railway today', @@ -583,16 +1222,116 @@ export default { // date picker menu menu_inservice_from: false, menu_inservice_to: false, + menu_inservice_from_tab2: false, + menu_inservice_to_tab2: false, menu_updated_on: false, - + memu_last_inspected: false, + menu_last_comp: false, inventory_tabs: null, - // question panel transition: 'slide-right', current_question: 0, question_dialog: false, question_list: [], - current_list: [] + current_list: [], + headers_train: [ + { text: 'Effective As Of', align: 'right', value: 'effective' }, + { text: '# of Trains Per Day', align: 'center', value: 'nTrains' }, + { text: '# of Pass Trains Per Day', align: 'center', value: 'nPTrains' }, + { text: '# of Freight Trains Per Day', align: 'center', value: 'nFTrains' }, + { text: 'Overall Maximum Speed (MPH) for Rail Approach from Left', value: 'maxSpeedL', align: 'center' }, + { text: 'Overall Maximum Speed (MPH) for Rail Approach from Right', value: 'maxSpeedR', align: 'center' }, + { text: 'Passengers Maximum Speed (MPH) for Rail Approach from Left', value: 'PmaxSpeedL', align: 'center' }, + { text: 'Passengers Maximum Speed (MPH) for Rail Approach from Right', value: 'PmaxSpeedR', align: 'center' }, + { text: 'Freight Maximum Speed (MPH) for Rail Approach from Left', value: 'FmaxSpeedL', align: 'center' }, + { text: 'Freight Maximum Speed (MPH) for Rail Approach from Right', value: 'FmaxSpeedR', align: 'center' }, + { text: 'Rail Design Speed (MPH) for Rail Approach from Left', value: 'RSpeedL', align: 'center' }, + { text: 'Rail Design Speed (MPH) for Rail Approach from Right', value: 'RSpeedR', align: 'center' }, + { text: 'Memo ', value: 'memo', align: 'center', sortable: false } + ], + pagination_train: {}, + train_traffic: [ + { + value: false, + effective: '2003/01/01', + nTrains: 16800.00, + nPTrains: 1200.00, + nFTrains: 800.00, + maxSpeedL: 120.00, + maxSpeedR: 120.00, + PmaxSpeedL: 90.00, + PmaxSpeedR: 90.00, + FmaxSpeedL: 80.00, + FmaxSpeedR: 80.00, + RSpeedL: 85.00, + RSpeedR: 85.00, + memo: 'good good' + }, + { + value: false, + effective: '2003/01/02', + nTrains: 16800.00, + nPTrains: 1200.00, + nFTrains: 800.00, + maxSpeedL: 120.00, + maxSpeedR: 120.00, + PmaxSpeedL: 90.00, + PmaxSpeedR: 90.00, + FmaxSpeedL: 80.00, + FmaxSpeedR: 80.00, + RSpeedL: 85.00, + RSpeedR: 85.00, + memo: 'good good' + }, + { + value: false, + effective: '2003/01/03', + nTrains: 16800.00, + nPTrains: 1200.00, + nFTrains: 800.00, + maxSpeedL: 120.00, + maxSpeedR: 120.00, + PmaxSpeedL: 90.00, + PmaxSpeedR: 90.00, + FmaxSpeedL: 80.00, + FmaxSpeedR: 80.00, + RSpeedL: 85.00, + RSpeedR: 85.00, + memo: 'good good' + } + ], + headers_vehicle: [ + { text: 'Effective As Of', align: 'right', value: 'effective' }, + { text: '# of Vehicles Per Day', align: 'center', value: 'nVehicles' }, + { text: '# of Pedestrains Per Day', align: 'center', value: 'nPedestrains' }, + { text: 'Road Posted/Unposted Speed (KPH) for Road Approach From Left', align: 'RPSpeedL', value: 'center' }, + { text: 'Road Posted/Unposted Speed (KPH) for Road Approach From Right', value: 'RPSpeedR', align: 'center' }, + { text: 'Road Crossing Design Speed (KPH) for Road Approach From Left', value: 'RCSpeedL', align: 'center' }, + { text: 'Road Crossing Design Speed (KPH) for Road Approach From Right', value: 'RCSpeedR', align: 'center' }, + { text: 'Design Vehicle', value: 'DVehicle', align: 'center' }, + { text: 'Information Source', value: 'ISource', align: 'center' }, + { text: 'Memo ', value: 'memo', align: 'center', sortable: false }, + { text: 'Cross Product Daily Train by Perdestrain', value: 'CPPerdestrain', align: 'center' }, + { text: 'Cross Product Daily Train by Vehicle', value: 'CPVehicle', align: 'center' } + ], + pagination_vehicle: {}, + vehicle_traffic: [ + { + value: false, + effective: '2003/02/01', + nVehicles: 16800.00, + nPedestrains: 1200.00, + RPSpeedL: 800.00, + RPSpeedR: 120.00, + RCSpeedL: 120.00, + RCSpeedR: 90.00, + DVehicle: 90.00, + ISource: 80.00, + memo: 'good good', + CPPerdestrain: 85.00, + CPVehicle: 85.00 + } + ] } }, methods: { From af8260468946307257de6be2f640e6c9875eb2f2 Mon Sep 17 00:00:00 2001 From: Jaredream Date: Sun, 3 Jun 2018 22:33:23 +0800 Subject: [PATCH 4/6] Added the last two tabs in the Crossing Modification Tab --- src/views/Form/index.vue | 3172 ++++++++++++++++++++------------------ 1 file changed, 1671 insertions(+), 1501 deletions(-) diff --git a/src/views/Form/index.vue b/src/views/Form/index.vue index fd9bf7e..07939ee 100644 --- a/src/views/Form/index.vue +++ b/src/views/Form/index.vue @@ -1,1502 +1,1672 @@ - - - - - - \ No newline at end of file From c97f5cfc2278a367657ba27efb8cd3bef0bf440e Mon Sep 17 00:00:00 2001 From: Jaredream Date: Sun, 3 Jun 2018 22:34:20 +0800 Subject: [PATCH 5/6] Added the final tab --- src/views/Form/index.vue | 64 ++++++++++++---------------------------- 1 file changed, 19 insertions(+), 45 deletions(-) diff --git a/src/views/Form/index.vue b/src/views/Form/index.vue index 07939ee..6a82c58 100644 --- a/src/views/Form/index.vue +++ b/src/views/Form/index.vue @@ -918,54 +918,17 @@
@@ -1501,6 +1464,17 @@ export default { pagination_accident: {}, vpAccident: [ + ], + headers_info: [ + { text: 'Shared By', align: 'left', value: 'shareby' }, + { text: 'Last Updated Date', align: 'left', value: 'lastUpdated' }, + { text: 'Submission Date', align: 'left', value: 'subDate' }, + { text: 'Shared Reason', align: 'left', value: 'reason' }, + { text: 'Shared Memo', align: 'left', value: 'memo' } + ], + pagination_info: {}, + infoSharing: [ + ] } }, From ef9246a7bb9c6483bcdcc4394ba902d67fa78b70 Mon Sep 17 00:00:00 2001 From: Jaredream Date: Mon, 4 Jun 2018 10:13:18 +0800 Subject: [PATCH 6/6] Add the no data altert to improve ux --- src/views/Form/index.vue | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/views/Form/index.vue b/src/views/Form/index.vue index 6a82c58..fadbcb9 100644 --- a/src/views/Form/index.vue +++ b/src/views/Form/index.vue @@ -819,6 +819,11 @@ {{ props.item.RSpeedR }} {{ props.item.memo }} + @@ -847,6 +852,11 @@ {{ props.item.CPPerdestrain }} {{ props.item.CPVehicle }} + @@ -907,6 +917,11 @@ {{ props.item.cause3 }} {{ props.item.occuSummary }} + @@ -930,6 +945,11 @@ {{ props.item.reason }} {{ props.item.memo }} +