From ac66236eaa7ff0211e9ac3367bd37a66d64f0816 Mon Sep 17 00:00:00 2001 From: Nicola Carminati Date: Tue, 19 Mar 2019 11:18:34 +0100 Subject: [PATCH] Fixing: Loading images, translations, alarm source --- Step.Utils/languages/IT.xml | 8 +-- .../Database/SignalRDatabaseHandler.cs | 2 +- .../assets/icons/png/machine-info-black.png | Bin 0 -> 15414 bytes Step/wwwroot/assets/styles/base/alarms.less | 19 +++++- .../assets/styles/base/maintenance.less | 22 +++++-- Step/wwwroot/assets/styles/base/users.less | 18 ++++++ Step/wwwroot/assets/styles/style.css | 56 +++++++++++++++--- .../alarms/components/alarm-history.ts | 3 + .../alarms/components/alarm-history.vue | 5 +- .../maintenance/components/maintenance.ts | 3 + .../maintenance/components/maintenance.vue | 3 +- .../src/app_modules/users/components/users.ts | 7 ++- .../app_modules/users/components/users.vue | 1 + 13 files changed, 120 insertions(+), 27 deletions(-) create mode 100644 Step/wwwroot/assets/icons/png/machine-info-black.png diff --git a/Step.Utils/languages/IT.xml b/Step.Utils/languages/IT.xml index 8489ae8f..e4e41715 100644 --- a/Step.Utils/languages/IT.xml +++ b/Step.Utils/languages/IT.xml @@ -467,7 +467,7 @@ Sei sicuro di aver eseguito questa manutenzione? - Gestore delle manutenzioni + Gestore Manutenzioni Salva Mostra tutti i file Mostra solo gli ultimi file @@ -519,7 +519,7 @@ Modifica Manutenzione - Gestore della produzione + Gestore Produzione CMS CNC Softkey Preferite @@ -544,7 +544,7 @@ NC PLC - Gestore dello Storico allarmi + Gestore Storico Allarmi Filtra allarmi per titolo Titolo... Sorgente @@ -573,7 +573,7 @@ Modifica ruolo: %s Sei sicuro di voler eliminare l'utente? Aggiungi un nuovo utente - Gestore deli Utenti + Gestore Utenti Filtra utenti per Username Username... Avatar diff --git a/Step/Listeners/Database/SignalRDatabaseHandler.cs b/Step/Listeners/Database/SignalRDatabaseHandler.cs index c267ed19..7f332d59 100644 --- a/Step/Listeners/Database/SignalRDatabaseHandler.cs +++ b/Step/Listeners/Database/SignalRDatabaseHandler.cs @@ -176,7 +176,7 @@ namespace Step.Listeners.Database { int processesByte = 0; // Convert list to byte - x.Process.ForEach(y => processesByte |= (1 << y)); + x.Process.ForEach(y => processesByte |= (1 << (y-1))); return new AlarmOccurrencesModel() { diff --git a/Step/wwwroot/assets/icons/png/machine-info-black.png b/Step/wwwroot/assets/icons/png/machine-info-black.png new file mode 100644 index 0000000000000000000000000000000000000000..8070591bf9a9cbd4013b4271d7397dc6ee86cb45 GIT binary patch literal 15414 zcmeI3Yiu0V701Uhc7nk%G_6vS5SF#5XzbZ}?87^web{(S>?9i!KN_cPU}tCUdWY=J zEIZ@u+EE*;2#9G4sg(kum5Nj~ZCyfBqNWm!lnN0-%PWW`1%p%&kl;W`2}C?Zpm+A| z>-DV#RD8K3?e3iWzvrBp-@WJTe3|hL>sL26ENh@Bsq~esfype$sK0HsZJ1AyGPTYZ*+aXJi1jD6nikx;LD0IKoXdeEt^behM4u+ zb8$s@ZVfYbTW*TE)o<^x650mC8*H6=8ra+p4=uBt%ho11IJc)wXlu3c&}LXK!?QFi zh;FCI^0vZZ4>Z6tUs{QYy`k$1>7eDe$4xUOGE63uab%nhJw3#5f*>#~&+t4AXVAuo zW=dIFGn(^3ig7}~kke|)RCUc}#g(G^u<5tktwg1xa9_z(DUoIr*g=X+R!T9PgJr5Y zDRRjtHJnc5E=`dckN`=bnFjRZs`{nkx~Us+eU6kRdCtUeO~T<)?yA?DOjb>8m|fc- zf&$X2o<{#j3NXFE(1+79=-LKvrMcSOn`*4QI5Q$y%AD5@vg#aemXdeNZH4>_`QW{Z zooOJMdb(fN6M_6L+fYPk>+HQY|sax@T7--^)TA^7n3Oi;W6FaSGfTTl?9>x_8eSF%IDJgD;R>(ZP7`}H!;~}` z^n?O%z@e&&r~uFw<-9IBD#<+UjJiCu;F6p)@8M;yCn^gu0He=xpA|Z!%fnW+z|i@| zqUbUVU%sp;2VBvplc!x0AEP-A2y~Q(MK7>GW@DZB*iZcp4ppAy#F1pR-;%IM_IoH|x zz%4UJi$X%pb*Pk-Hh@)setWS1OD(O`u`Hil9gC7|^|pX)l?PCK%#6|UWtBV&ZtCpi zoF9UG{0jHEb7bN`!hUoIrzbZf4*snkRnlqT%bE zHo3buOi`oPP}JD16!p<(@OPS`hFOX_6QL;aK8jkZPuz6$dWx!fv?tWjpPhPp@3Sp+ z8^3-mxZ2+I)4B%z)%|-Kx3#`_;Nb4o7hYO*G}!*)s_$KL{^X%^&C54m`$=u@o~xEm zoO}J~A6d___f9pwHj;VdH(K~##?U(#p8AEcqj7T0o&~#VKN$P;;qOzm8(+HnyOTS$ zOWK`B{_Kd{6Fl@wYF{)F92g&4zjxvLW8ctDaKW>SyxbJKd;Iq`m-o~*?>jpZSv&BD zPnV_o2JT&V$HTYO+}XVY9PLsbjZfRpKVNrd=|OYnj&&jJ*0+{MmPdlO-)8*!o-H*uE?F_De{J{2 zKidVfuRM_W@xQl59*_UvuWR;xyr=HuPdp2EElaNSx~J-oudKhX@5Ge{pP)~7Z@=+@ z3x8X1{;q-HXaDi!M=RbRTdV~WKYU}X_E&$RF1+#gj#r+F``hn$y5p5+;+^eVzWG4Y z#-=xG{E-L8nl3)I{j$ii!HaHQQvboFt!w|&_x$O|#G$o2pRloA)2qinOET@>8E86k z;DyT?pXt%Z>W>9ZHXnaz@&@VZsZ+KU?eg(V@VV{n|Ew_hDfya;O(x%p? i2Pe<$A3oefUA1Y+qIbVlzteiNx2J1;=%MQ(Kl(4ko%G=V literal 0 HcmV?d00001 diff --git a/Step/wwwroot/assets/styles/base/alarms.less b/Step/wwwroot/assets/styles/base/alarms.less index 9cf15cbd..26556e17 100644 --- a/Step/wwwroot/assets/styles/base/alarms.less +++ b/Step/wwwroot/assets/styles/base/alarms.less @@ -704,7 +704,7 @@ } .selectBoxU{ position: relative; - width: 180px; + width: 320px; } .selectBoxU select{ width: 100%; @@ -754,6 +754,21 @@ border-radius: 2px; position: relative; border: solid 1px @color-label-grey; + .loading{ + display: flex; + align-items: center; + position: absolute; + top: 0px; + left: 0px; + right: 0px; + bottom: 0px; + height: 100%; + line-height: 100%; + background-color: #ffffff; + font-size: 5em; + color: #4b4b4b; + justify-content: center; + } table{ table-layout: fixed; width: 100%; @@ -919,7 +934,7 @@ } .subtitle{ margin-bottom: 15px; - span{ + .inside{ height: 21px; border: solid 1px @color-warm-grey2; font-size: 14px; diff --git a/Step/wwwroot/assets/styles/base/maintenance.less b/Step/wwwroot/assets/styles/base/maintenance.less index 9346b0a2..68655c64 100644 --- a/Step/wwwroot/assets/styles/base/maintenance.less +++ b/Step/wwwroot/assets/styles/base/maintenance.less @@ -132,6 +132,22 @@ border-radius: 2px; position: relative; border: solid 1px @color-label-grey; + + .loading{ + display: flex; + align-items: center; + position: absolute; + top: 0px; + left: 0px; + right: 0px; + bottom: 0px; + height: 100%; + line-height: 100%; + background-color: #ffffff; + font-size: 5em; + color: #4b4b4b; + justify-content: center; + } table{ table-layout: fixed; width: 100%; @@ -175,9 +191,6 @@ width:30px; max-width:30px; text-align: left; - .machine-img{ - filter: invert(); - } } th, td{ overflow: hidden; @@ -203,9 +216,6 @@ &.selected{ background-color: rgba(23, 145, 255, 0.75); color: @color-white; - .machine-img{ - filter: none; - } td div.maintenance-progress.selected{ label{ color: @color-white; diff --git a/Step/wwwroot/assets/styles/base/users.less b/Step/wwwroot/assets/styles/base/users.less index 46b24c65..8785a277 100644 --- a/Step/wwwroot/assets/styles/base/users.less +++ b/Step/wwwroot/assets/styles/base/users.less @@ -148,6 +148,24 @@ width: 100%; max-height: 680px; border: solid 1px #979797; + position: relative; + + .loading{ + display: flex; + align-items: center; + position: absolute; + top: 0px; + left: 0px; + right: 0px; + bottom: 0px; + height: 100%; + line-height: 100%; + background-color: #ffffff; + font-size: 5em; + color: #4b4b4b; + justify-content: center; + } + table{ table-layout: fixed; width: 100%; diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css index 9fd7a452..93941fc6 100644 --- a/Step/wwwroot/assets/styles/style.css +++ b/Step/wwwroot/assets/styles/style.css @@ -4893,7 +4893,7 @@ footer .container button.big:before { } .alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-left-filter .selectBoxU { position: relative; - width: 180px; + width: 320px; } .alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-left-filter .selectBoxU select { width: 100%; @@ -4947,6 +4947,21 @@ footer .container button.big:before { position: relative; border: solid 1px #979797; } +.alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table .loading { + display: flex; + align-items: center; + position: absolute; + top: 0px; + left: 0px; + right: 0px; + bottom: 0px; + height: 100%; + line-height: 100%; + background-color: #ffffff; + font-size: 5em; + color: #4b4b4b; + justify-content: center; +} .alarm-history-container .alarm-history-body .alarm-history-body-left .alarm-history-table table { table-layout: fixed; width: 100%; @@ -5119,7 +5134,7 @@ footer .container button.big:before { .alarm-history-container .alarm-history-body .alarm-history-body-right .box-right .box-right-info .box-right-info-header .subtitle { margin-bottom: 15px; } -.alarm-history-container .alarm-history-body .alarm-history-body-right .box-right .box-right-info .box-right-info-header .subtitle span { +.alarm-history-container .alarm-history-body .alarm-history-body-right .box-right .box-right-info .box-right-info-header .subtitle .inside { height: 21px; border: solid 1px #9b9b9b; font-size: 14px; @@ -16522,6 +16537,21 @@ footer .container button.big:before { position: relative; border: solid 1px #979797; } +.maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-body .loading { + display: flex; + align-items: center; + position: absolute; + top: 0px; + left: 0px; + right: 0px; + bottom: 0px; + height: 100%; + line-height: 100%; + background-color: #ffffff; + font-size: 5em; + color: #4b4b4b; + justify-content: center; +} .maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-body table { table-layout: fixed; width: 100%; @@ -16573,9 +16603,6 @@ footer .container button.big:before { max-width: 30px; text-align: left; } -.maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-body table td:nth-child(5) .machine-img { - filter: invert(); -} .maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-body table th, .maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-body table td { overflow: hidden; @@ -16605,9 +16632,6 @@ footer .container button.big:before { background-color: rgba(23, 145, 255, 0.75); color: #fff; } -.maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-body table tbody tr.selected .machine-img { - filter: none; -} .maintenance-container .maintenance-box .maintenance-body .maintenance-box-left .maintenance-box-left-body table tbody tr.selected td div.maintenance-progress.selected label { color: #fff; } @@ -19364,6 +19388,22 @@ footer .container button.big:before { width: 100%; max-height: 680px; border: solid 1px #979797; + position: relative; +} +.users-container .users-box .users-body .users-table .loading { + display: flex; + align-items: center; + position: absolute; + top: 0px; + left: 0px; + right: 0px; + bottom: 0px; + height: 100%; + line-height: 100%; + background-color: #ffffff; + font-size: 5em; + color: #4b4b4b; + justify-content: center; } .users-container .users-box .users-body .users-table table { table-layout: fixed; diff --git a/Step/wwwroot/src/app_modules/alarms/components/alarm-history.ts b/Step/wwwroot/src/app_modules/alarms/components/alarm-history.ts index 23996841..f292786d 100644 --- a/Step/wwwroot/src/app_modules/alarms/components/alarm-history.ts +++ b/Step/wwwroot/src/app_modules/alarms/components/alarm-history.ts @@ -74,6 +74,7 @@ export default class AlarmHistory extends Vue { enableModifyNote = true; selectedPage = 1; visiblePages = 3; + onloading: boolean = false; // get filteredAttaches() { // return this.attaches.filter((v, idx) => idx < this.limitationList); // } @@ -149,6 +150,7 @@ export default class AlarmHistory extends Vue { var $this = this; ModalHelper.HideModal("modal-internal"); + this.onloading = true; this.users = await awaiter(loginService.getAllUsers()); this.users.unshift({ id: -1, username: this.$options.filters.localize("alarm_history_users_not_user", "Nessun utente") }); this.paginationData = await awaiter(alarmsService.getAlarmsData()); @@ -156,6 +158,7 @@ export default class AlarmHistory extends Vue { for (let index = 0; index < this.users.length; index++) { this.filter.multiUser.push(this.users[index].username); } + this.onloading = false; } async onChange(e) { diff --git a/Step/wwwroot/src/app_modules/alarms/components/alarm-history.vue b/Step/wwwroot/src/app_modules/alarms/components/alarm-history.vue index 4bceb402..efd8011b 100644 --- a/Step/wwwroot/src/app_modules/alarms/components/alarm-history.vue +++ b/Step/wwwroot/src/app_modules/alarms/components/alarm-history.vue @@ -88,6 +88,7 @@
+
@@ -136,8 +137,8 @@ {{'alarm_'+ selectedAlarm.alarmId | localize('alarm_'+ selectedAlarm.alarmId)}}
- {{'alarm_history_filter_nc' | localize("NC")}}{{ p }} - {{'alarm_history_filter_plc' | localize("PLC")}}{{ p }} + {{'alarm_history_filter_nc' | localize("NC")}}{{p}} + {{'alarm_history_filter_plc' | localize("PLC")}}{{p}}
diff --git a/Step/wwwroot/src/app_modules/maintenance/components/maintenance.ts b/Step/wwwroot/src/app_modules/maintenance/components/maintenance.ts index 05593b92..1d940fdd 100644 --- a/Step/wwwroot/src/app_modules/maintenance/components/maintenance.ts +++ b/Step/wwwroot/src/app_modules/maintenance/components/maintenance.ts @@ -20,6 +20,7 @@ export default class Maintenance extends Vue { public get maintenances(): server.Maintenance[] { return (this.$store.state as AppModel).maintenance.maintenances; } public enableMaintenance: boolean = true; + onloading: boolean = false; get selectedMaintenance() { @@ -59,6 +60,7 @@ export default class Maintenance extends Vue { } async mounted() { + this.onloading = true; Factory.Get(MessageService).subscribeToChannel("update-maintenance", args => { awaiter(new MaintenanceService().GetMaintenances()); }); @@ -68,6 +70,7 @@ export default class Maintenance extends Vue { this.selectedMaintenanceId = this.$route.params.id; this.enableMaintenance = false; } + this.onloading = false; } updated() { diff --git a/Step/wwwroot/src/app_modules/maintenance/components/maintenance.vue b/Step/wwwroot/src/app_modules/maintenance/components/maintenance.vue index 1ddba6d0..1e8c25b0 100644 --- a/Step/wwwroot/src/app_modules/maintenance/components/maintenance.vue +++ b/Step/wwwroot/src/app_modules/maintenance/components/maintenance.vue @@ -71,6 +71,7 @@
+
@@ -90,7 +91,7 @@ diff --git a/Step/wwwroot/src/app_modules/users/components/users.ts b/Step/wwwroot/src/app_modules/users/components/users.ts index 066f3b40..a993fcaa 100644 --- a/Step/wwwroot/src/app_modules/users/components/users.ts +++ b/Step/wwwroot/src/app_modules/users/components/users.ts @@ -20,7 +20,8 @@ export default class Users extends Vue { public selectedUser: any = null; public users: any = []; public currentFilter: string = ""; - public isLoading: boolean = false; + public onloading: boolean = false; + get Users() { if(this.selectedUser) @@ -92,9 +93,9 @@ export default class Users extends Vue { } async mounted() { - this.isLoading = true; + this.onloading = true; await awaiter (usersService.getUsers()); - this.isLoading = false; + this.onloading = false; } async reloadUsers() { diff --git a/Step/wwwroot/src/app_modules/users/components/users.vue b/Step/wwwroot/src/app_modules/users/components/users.vue index b0a06b6f..5021310f 100644 --- a/Step/wwwroot/src/app_modules/users/components/users.vue +++ b/Step/wwwroot/src/app_modules/users/components/users.vue @@ -28,6 +28,7 @@
+
- +