Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing: Loading images, translations, alarm source

Browse Source
This commit is contained in:
Nicola Carminati
2019-03-19 11:18:34 +01:00
parent 3dae3fdbac
commit ac66236eaa
13 changed files with 120 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step.Utils/languages/IT.xml
+4 -4
View File
@@ -467,7 +467,7 @@
<modal_confirm_perform_maintenance>Sei sicuro di aver eseguito questa manutenzione?</modal_confirm_perform_maintenance>
<!-- Maintenance Manager -->
<maintenance_header_title>Gestore delle manutenzioni</maintenance_header_title>
<maintenance_header_title>Gestore Manutenzioni</maintenance_header_title>
<maintenance_card_btn_save_note>Salva</maintenance_card_btn_save_note>
<maintenance_card_btn_view_all_attach>Mostra tutti i file</maintenance_card_btn_view_all_attach>
<maintenance_card_btn_hide_all_attach>Mostra solo gli ultimi file</maintenance_card_btn_hide_all_attach>
@@ -519,7 +519,7 @@
<create_maintenance_btn_edit_confirm>Modifica Manutenzione</create_maintenance_btn_edit_confirm>
<!-- Production Manager -->
<production_header_title>Gestore della produzione</production_header_title>
<production_header_title>Gestore Produzione</production_header_title>
<production_box_video_button_cms>CMS</production_box_video_button_cms>
<production_box_video_button_cnc>CNC</production_box_video_button_cnc>
<production_softkeys_prefered_header_title>Softkey Preferite</production_softkeys_prefered_header_title>
@@ -544,7 +544,7 @@
<!-- Alarm-History Manager -->
<alarm_history_filter_nc>NC</alarm_history_filter_nc>
<alarm_history_filter_plc>PLC</alarm_history_filter_plc>
<alarm_history_header_title>Gestore dello Storico allarmi</alarm_history_header_title>
<alarm_history_header_title>Gestore Storico Allarmi</alarm_history_header_title>
<alarm_history_body_filter>Filtra allarmi per titolo</alarm_history_body_filter>
<alarm_history_body_filter_placeholder>Titolo...</alarm_history_body_filter_placeholder>
<alarm_history_body_filter_source>Sorgente</alarm_history_body_filter_source>
@@ -573,7 +573,7 @@
<role_user_lbl_title_window>Modifica ruolo: %s</role_user_lbl_title_window>
<modal_confirm_delete_user>Sei sicuro di voler eliminare l'utente?</modal_confirm_delete_user>
<users_label_create_users>Aggiungi un nuovo utente</users_label_create_users>
<users_header_title>Gestore deli Utenti</users_header_title>
<users_header_title>Gestore Utenti</users_header_title>
<users_header_label_userfilter>Filtra utenti per Username</users_header_label_userfilter>
<users_header_label_userfilter_placeholder>Username...</users_header_label_userfilter_placeholder>
<users_table_header_avatar>Avatar</users_table_header_avatar>
Step/Listeners/Database/SignalRDatabaseHandler.cs
+1 -1
View File
@@ -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()
{
Step/wwwroot/assets/icons/png/machine-info-black.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

Step/wwwroot/assets/styles/base/alarms.less
+17 -2
View File
@@ -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;
Step/wwwroot/assets/styles/base/maintenance.less
+16 -6
View File
@@ -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;
Step/wwwroot/assets/styles/base/users.less
+18
View File
@@ -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%;
Step/wwwroot/assets/styles/style.css
+48 -8
View File
@@ -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;
Step/wwwroot/src/app_modules/alarms/components/alarm-history.ts
+3
View File
@@ -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) {
Step/wwwroot/src/app_modules/alarms/components/alarm-history.vue
+3 -2
View File
@@ -88,6 +88,7 @@
</div>
</div>
<div class="alarm-history-table">
<div class="loading" v-if="onloading"><i class="fa fa-circle-o-notch fa-spin"></i></div>
<table>
<thead>
<tr>
@@ -136,8 +137,8 @@
<span v-if="selectedAlarm.source == 1 ">{{'alarm_'+ selectedAlarm.alarmId | localize('alarm_'+ selectedAlarm.alarmId)}}</span>
</div>
<div class="subtitle">
<span v-if="selectedAlarm.source == 0 ">{{'alarm_history_filter_nc' | localize("NC")}}</span><span v-if="selectedAlarm.source == 0 && selectedAlarm.processes.length>0" v-for="p in selectedAlarm.processes" :key="p" >{{ p }}</span>
<span v-if="selectedAlarm.source == 1 ">{{'alarm_history_filter_plc' | localize("PLC")}}</span><span v-if="selectedAlarm.source == 1 && selectedAlarm.processes.length>0" v-for="p in selectedAlarm.processes" :key="p" >{{ p }}</span>
<span class="inside" v-if="selectedAlarm.source == 0 ">{{'alarm_history_filter_nc' | localize("NC")}}</span><span class="inside" v-if="selectedAlarm.source == 0 && selectedAlarm.processes.length>0"><span v-for="p in selectedAlarm.processes" :key="p" >{{p}} </span></span>
<span class="inside" v-if="selectedAlarm.source == 1 ">{{'alarm_history_filter_plc' | localize("PLC")}}</span><span class="inside" v-if="selectedAlarm.source == 1 && selectedAlarm.processes.length>0"><span v-for="p in selectedAlarm.processes" :key="p" >{{p}} </span></span>
</div>
<div class="date">
<label>{{convertDate(selectedAlarm.timeStamp)}}&nbsp;&nbsp;&nbsp;{{convertDateToTime(selectedAlarm.timeStamp)}}</label>
Step/wwwroot/src/app_modules/maintenance/components/maintenance.ts
+3
View File
@@ -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() {
Step/wwwroot/src/app_modules/maintenance/components/maintenance.vue
+2 -1
View File
@@ -71,6 +71,7 @@
</div>
</div>
<div class="maintenance-box-left-body" @focus="extendSelectState = false">
<div class="loading" v-if="onloading"><i class="fa fa-circle-o-notch fa-spin"></i></div>
<table>
<thead>
<tr>
@@ -90,7 +91,7 @@
<td colspan="1" >
<i v-if="m.type == 'EXP_DATE'" class="fa fa-calendar"></i>
<i v-if="m.type == 'TIME_INTERVAL'" class="fa fa-clock-o"></i>
<img v-if="m.type == 'MACHINE_INTERVAL'" src="assets/icons/png/machine-info.png" width="15px" class="machine-img">
<img v-if="m.type == 'MACHINE_INTERVAL'" src="assets/icons/png/machine-info-black.png" width="15px" class="machine-img">
<i v-if="!m.createdByCms" class="fa fa-user"></i>
<img v-if="m.createdByCms" src="assets/icons/png/logo.png" width="14px" >
</td>
Step/wwwroot/src/app_modules/users/components/users.ts
+4 -3
View File
@@ -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() {
Step/wwwroot/src/app_modules/users/components/users.vue
+1
View File
@@ -28,6 +28,7 @@
</div>
<div class="users-table">
<div class="loading" v-if="onloading"><i class="fa fa-circle-o-notch fa-spin"></i></div>
<table>
<thead>
<tr>