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

Added author for performed maintenances

Browse Source
This commit is contained in:
Nicola Carminati
2018-12-19 17:46:02 +01:00
parent 356e0eaae2
commit 43ce78d2b1
4 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step.Utils/languages/IT.xml
+4 -5
View File
@@ -140,7 +140,6 @@
<tooling_edgesdataequip_new>Nuovo Offset</tooling_edgesdataequip_new>
<siemens_tooling_edgesdataequip_new>Nuovo Tagliente</siemens_tooling_edgesdataequip_new>
<tooling_parameters_tab>Parametri</tooling_parameters_tab>
<siemens_tooling_equipment_editlabel>Modifica utensile n. %d - %s</siemens_tooling_equipment_editlabel>
<tooling_equipment_editlabel>Modifica utensile n. %d</tooling_equipment_editlabel>
<tooling_equipment_newlabel>Creazione Nuovo Utensile</tooling_equipment_newlabel>
<siemens_tooling_edgesdata_label_edit>Modifica Tagliente n. %d</siemens_tooling_edgesdata_label_edit>
@@ -470,10 +469,10 @@
<maintenance_card_btn_cancel_modify_note>Cancella</maintenance_card_btn_cancel_modify_note>
<maintenance_card_btn_save_modify_note>Salva</maintenance_card_btn_save_modify_note>
<maintenance_date_neverdone>Nessun intervento di manutenzione effettuato</maintenance_date_neverdone>
<maintenance_date_justdone>Ultimo intervento effettuato pochi minuti fa</maintenance_date_justdone>
<maintenance_date_hours>Ultimo intervento effettuato %d ore fa</maintenance_date_hours>
<maintenance_date_days>Ultimo intervento effettuato %d giorni fa</maintenance_date_days>
<maintenance_date_fixeddate>Ultimo intervento effettuato in data: %s</maintenance_date_fixeddate>
<maintenance_date_justdone>Ultimo intervento effettuato pochi minuti fa, da: %s</maintenance_date_justdone>
<maintenance_date_hours>Ultimo intervento effettuato %d ore fa, da: %s</maintenance_date_hours>
<maintenance_date_days>Ultimo intervento effettuato %d giorni fa, da: %s</maintenance_date_days>
<maintenance_date_fixeddate>Ultimo intervento effettuato in data: %s, da: %s</maintenance_date_fixeddate>
<maintenance_card_created_timestamp>Manutenzione creata in data %s alle ore %s</maintenance_card_created_timestamp>
<maintenance_card_attachments>Allegati</maintenance_card_attachments>
<maintenance_card_notes>Note</maintenance_card_notes>
Step.Utils/languages/en.xml
+4 -5
View File
@@ -140,7 +140,6 @@
<tooling_edgesdataequip_new>New Offset</tooling_edgesdataequip_new>
<siemens_tooling_edgesdataequip_new>New Cutting Edge</siemens_tooling_edgesdataequip_new>
<tooling_parameters_tab>Parameters</tooling_parameters_tab>
<siemens_tooling_equipment_editlabel>Edit Tool no. %d - %s</siemens_tooling_equipment_editlabel>
<tooling_equipment_editlabel>Edit Tool no. %d</tooling_equipment_editlabel>
<tooling_equipment_newlabel>New Tool Creation</tooling_equipment_newlabel>
<tooling_edgesdata_label_edit>Edit Offset no. %d</tooling_edgesdata_label_edit>
@@ -469,10 +468,10 @@
<maintenance_card_btn_cancel_modify_note>Cancel</maintenance_card_btn_cancel_modify_note>
<maintenance_card_btn_save_modify_note>Save</maintenance_card_btn_save_modify_note>
<maintenance_date_neverdone>Maintenance never registered</maintenance_date_neverdone>
<maintenance_date_justdone>Last maintenance registered few minutes ago</maintenance_date_justdone>
<maintenance_date_hours>Last maintenance registered %d hours ago</maintenance_date_hours>
<maintenance_date_days>Last maintenance registered %d days ago</maintenance_date_days>
<maintenance_date_fixeddate>Last maintenance registered in: %s</maintenance_date_fixeddate>
<maintenance_date_justdone>Last maintenance registered few minutes ago, from: %s</maintenance_date_justdone>
<maintenance_date_hours>Last maintenance registered %d hours ago, from: %s</maintenance_date_hours>
<maintenance_date_days>Last maintenance registered %d days ago, from: %s</maintenance_date_days>
<maintenance_date_fixeddate>Last maintenance registered in: %s, from: %s</maintenance_date_fixeddate>
<maintenance_card_created_timestamp>Maintenance created in %s at %s</maintenance_card_created_timestamp>
<maintenance_card_attachments>Attachments</maintenance_card_attachments>
<maintenance_card_notes>Notes</maintenance_card_notes>
Step/wwwroot/src/app_modules/maintenance/components/maintenance-card.ts
+5 -4
View File
@@ -165,14 +165,15 @@ export default class MaintenanceCard extends Vue {
var end = moment(m.lastPerformedDate);
var days = (moment.duration(today.diff(end)) as any)._data.days;
var hours = (moment.duration(today.diff(end)) as any)._data.hours;
var author = m.maintainer.username;
if (hours == 0)
return this.$options.filters.localize("maintenance_date_justdone", "Ultimo intervento effettuato pochi minuti fa");
return this.$options.filters.localize("maintenance_date_justdone", "Ultimo intervento effettuato pochi minuti fa, da: %s");
else if (days == 0)
return this.$options.filters.localize("maintenance_date_hours", "Ultimo intervento effettuato %d ore fa", hours);
return this.$options.filters.localize("maintenance_date_hours", "Ultimo intervento effettuato %d ore fa, da: %s", hours,author);
else if (days <= 7)
return this.$options.filters.localize("maintenance_date_days", "Ultimo intervento effettuato %d giorni fa", days);
return this.$options.filters.localize("maintenance_date_days", "Ultimo intervento effettuato %d giorni fa, da: %s", days,author);
else
return this.$options.filters.localize("maintenance_date_fixeddate", "Ultimo intervento effettuato in data: %s", moment(m.lastPerformedDate).format('L'));
return this.$options.filters.localize("maintenance_date_fixeddate", "Ultimo intervento effettuato in data: %s, da: %s", moment(m.lastPerformedDate).format('L'),author);
}
return "";
}
Step/wwwroot/src/app_modules/maintenance/components/maintenance-card.vue
+3 -1
View File
@@ -11,7 +11,9 @@
<div class="body">
<div class="box scrollable">
<div class="title-box">{{getDescMaintenance(selectedMaintenance.createdByCms, selectedMaintenance.id, selectedMaintenance.description)}}</div>
<div class="subtitle" v-if="existMantainance() && selectedMaintenance.state!='closed'">{{this.getDaysFromLastExpiration(selectedMaintenance)}}</div>
<div class="subtitle" v-if="existMantainance() && selectedMaintenance.state!='closed'">
{{this.getDaysFromLastExpiration(selectedMaintenance)}}
</div>
<div class="subtitle closed" v-if="existMantainance() && selectedMaintenance.state=='closed'">&nbsp;</div>
<div class="subtitle" v-if="!existMantainance()">{{'maintenance_date_neverdone' | localize("Nessuna manutenzione effettuata")}}</div>
<div class="info">