diff --git a/package.json b/package.json
index 37616f6..0dd2788 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "genera-tor",
- "version": "1.4.1",
+ "version": "1.4.2",
"private": true,
"type": "module",
"scripts": {
diff --git a/src/components/Order.vue b/src/components/Order.vue
index 1637620..dcfe90e 100644
--- a/src/components/Order.vue
+++ b/src/components/Order.vue
@@ -186,4 +186,10 @@ select {
opacity: 0;
}
}
+
+textarea.others {
+ width: 100%;
+ min-height: 200px;
+ resize: vertical;
+}
diff --git a/src/components/OrderN.vue b/src/components/OrderN.vue
index e2f1825..d7a5f8c 100644
--- a/src/components/OrderN.vue
+++ b/src/components/OrderN.vue
@@ -285,6 +285,46 @@
+
+ |
+
+
+
+
+ |
+
+
+
+ Inne:
+
+
+ od
+
+ do
+
+ po torze nr
+
+ wprowadzono ruch dwukierunkowy.
+
+
+
+ |
+
@@ -401,6 +441,17 @@ export default defineComponent({
} i przejechać obok sygnału "Stój" na ${row.on || '_'} `;
return message;
+ },
+
+ () => {
+ const row = order.rows[5];
+
+ if (row.twoWay.enabled)
+ return `Inne: od ${row.twoWay.from || '_'} do ${row.twoWay.to || '_'} po torze nr ${
+ row.twoWay.trackNo || '_'
+ } wprowadzono ruch dwukierunkowy.`;
+
+ return 'Inne: ' + row.content;
}
];
@@ -453,7 +504,7 @@ export default defineComponent({
generateMessage() {
let message = this.rowMethods[0]();
- for (let i = 0; i < 5; i++) {
+ for (let i = 0; i < this.order.rows.length; i++) {
if (!this.order.rows[i].enabled) continue;
message += ` [ ${i + 1} ] ${this.rowMethods[i + 1]()}`;
diff --git a/src/components/OrderO.vue b/src/components/OrderO.vue
index 0eb1986..aa7707b 100644
--- a/src/components/OrderO.vue
+++ b/src/components/OrderO.vue
@@ -65,13 +65,13 @@
-
-
- 2. Inne:
-
-
-
+
+
+ 2. Inne:
+
+
+
@@ -189,10 +189,12 @@ th {
input {
width: 80%;
}
+}
+.order_table {
textarea {
- width: 80%;
- height: 40px;
+ width: 90%;
+ min-height: 50px;
resize: vertical;
}
}
@@ -203,14 +205,7 @@ th {
display: flex;
flex-direction: column;
- height: 285px;
padding: 0.5em;
-
- textarea {
- resize: vertical;
- height: 220px;
- width: 95%;
- }
}
diff --git a/src/components/OrderS.vue b/src/components/OrderS.vue
index ceb26dc..b447604 100644
--- a/src/components/OrderS.vue
+++ b/src/components/OrderS.vue
@@ -202,7 +202,7 @@
-
+
|
@@ -265,7 +265,13 @@
-
+
|
@@ -438,11 +444,3 @@ export default defineComponent({
}
});
-
-
diff --git a/src/store/store.ts b/src/store/store.ts
index 8093a5d..cbe3841 100644
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -137,6 +137,16 @@ export const useStore = defineStore('store', {
stationType: 'stację',
stationName: '',
on: ''
+ },
+ {
+ enabled: false,
+ content: '',
+ twoWay: {
+ enabled: false,
+ from: '',
+ to: '',
+ trackNo: ''
+ }
}
]
} as IOrderN,
diff --git a/src/types/orderTypes.ts b/src/types/orderTypes.ts
index e0702b6..592d347 100644
--- a/src/types/orderTypes.ts
+++ b/src/types/orderTypes.ts
@@ -66,6 +66,16 @@ export interface IOrderN {
stationType: string;
stationName: string;
on: string;
+ },
+ {
+ enabled: boolean;
+ content: string;
+ twoWay: {
+ enabled: boolean;
+ from: string;
+ to: string;
+ trackNo: string;
+ };
}
];
}