Merge remote-tracking branch 'CMS/develop' into develop

Thermo.Active.Config/Config/userSoftKeyConfig.xml

@@ -350,10 +350,8 @@
             <lang langKey="it">Apertura cornice</lang>
         </localizedNames>
         <visible>true</visible>
-        <refCall>
-            <paramRef>general_sizes_frame_dim_x</paramRef>
-            <label>general_sizes_frame_dim_x_button</label>
-        </refCall>
+        <refCallParam>general_sizes_frame_dim_x</refCallParam>
+        <refCallLabel>general_sizes_frame_dim_x_button</refCallLabel>
     </softKey_procedure>
 
     <softKey_procedure>
@@ -366,10 +364,8 @@
             <lang langKey="it">Profondità cornice</lang>
         </localizedNames>
         <visible>true</visible>
-        <refCall>
-            <paramRef>general_sizes_frame_dim_y</paramRef>
-            <label>general_sizes_frame_dim_y_button</label>
-        </refCall>
+        <refCallParam>general_sizes_frame_dim_y</refCallParam>
+        <refCallLabel>general_sizes_frame_dim_y_button</refCallLabel>
     </softKey_procedure>
 
     <softKey_procedure>
@@ -382,10 +378,8 @@
             <lang langKey="it">Larghezza piastrafinestra</lang>
         </localizedNames>
         <visible>true</visible>
-        <refCall>
-            <paramRef>general_sizes_plate_dim_x</paramRef>
-            <label>general_sizes_plate_dim_x_button</label>
-        </refCall>
+        <refCallParam>general_sizes_plate_dim_x</refCallParam>
+        <refCallLabel>general_sizes_plate_dim_x_button</refCallLabel>
     </softKey_procedure>
 
     <softKey_procedure>
@@ -398,10 +392,8 @@
             <lang langKey="it">Profondità piastrafinestra</lang>
         </localizedNames>
         <visible>true</visible>
-        <refCall>
-            <paramRef>general_sizes_plate_dim_y</paramRef>
-            <label>general_sizes_plate_dim_y_button</label>
-        </refCall>
+        <refCallParam>general_sizes_plate_dim_y</refCallParam>
+        <refCallLabel>general_sizes_plate_dim_y_button</refCallLabel>
     </softKey_procedure>
 
     <softKey_procedure>
@@ -426,10 +418,8 @@
             <lang langKey="it">Start Ciclo Caricatore</lang>
         </localizedNames>
         <visible>true</visible>
-        <refCall>
-            <paramRef>cycle_loader_enable</paramRef>
-            <label>cycle_loader_enable_button</label>
-        </refCall>
+        <refCallParam>cycle_loader_enable</refCallParam>
+        <refCallLabel>cycle_loader_enable_button</refCallLabel>
     </softKey_procedure>
 
     <softKey_procedure>
@@ -442,10 +432,8 @@
             <lang langKey="it">Dashboard Setpoint Plus</lang>
         </localizedNames>
         <visible>true</visible>
-        <refCall>
-            <paramRef>dash_setpoint_plus</paramRef>
-            <label>dash_setpoint_plus_button</label>
-        </refCall>
+        <refCallParam>dash_setpoint_plus</refCallParam>
+        <refCallLabel>dash_setpoint_plus_button</refCallLabel>
     </softKey_procedure>
 
     <softKey_procedure>
@@ -458,10 +446,8 @@
             <lang langKey="it">Dashboard Setpoint Minus</lang>
         </localizedNames>
         <visible>true</visible>
-        <refCall>
-            <paramRef>dash_setpoint_minus</paramRef>
-            <label>dash_setpoint_minus_button</label>
-        </refCall>
+        <refCallParam>dash_setpoint_minus</refCallParam>
+        <refCallLabel>dash_setpoint_minus_button</refCallLabel>
     </softKey_procedure>
 
     

Thermo.Active.Config/Config/userSoftKeyConfigValidator.xsd

@@ -24,14 +24,6 @@
             </xs:extension>
         </xs:simpleContent>
     </xs:complexType>
-    
-    <!--gestione refCall-->
-    <xs:complexType name="refCallType">
-        <xs:all>
-            <xs:element name="paramRef" minOccurs="1" maxOccurs="1" type="xs:string"></xs:element>
-            <xs:element name="label" minOccurs="1" maxOccurs="1" type="xs:string"></xs:element>
-        </xs:all>
-    </xs:complexType>
 
     <!-- Group of softkey type-->
     <xs:complexType name="groupType">
@@ -39,7 +31,8 @@
             <xs:element name="active" minOccurs="1" maxOccurs="1" type="xs:boolean"></xs:element>
             <xs:element name="visible" minOccurs="1" maxOccurs="1" type="xs:boolean"></xs:element>
             <xs:element name="starred" minOccurs="0" type="xs:boolean"></xs:element>
-            <xs:element name="refCall" minOccurs="0" type="refCallType"></xs:element>
+            <xs:element name="refCallLabel" minOccurs="0" type="xs:string"></xs:element>
+            <xs:element name="refCallParam" minOccurs="0" type="xs:string"></xs:element>
             <xs:element name="category" type="xs:integer"></xs:element>
             <xs:element name="operatorConfirmationNeeded" type="xs:boolean"></xs:element>
             <xs:element name="localizedNames">
@@ -75,7 +68,8 @@
             <xs:element name="active" minOccurs="1" maxOccurs="1" type="xs:boolean"></xs:element>
             <xs:element name="visible" minOccurs="1" maxOccurs="1" type="xs:boolean"></xs:element>
             <xs:element name="starred" minOccurs="0" type="xs:boolean"></xs:element>
-            <xs:element name="refCall" minOccurs="0" type="refCallType"></xs:element>
+            <xs:element name="refCallLabel" minOccurs="0" type="xs:string"></xs:element>
+            <xs:element name="refCallParam" minOccurs="0" type="xs:string"></xs:element>
             <xs:element name="category" type="xs:integer"></xs:element>
             <xs:element name="operatorConfirmationNeeded" type="xs:boolean"></xs:element>
             <xs:element name="localizedNames">
@@ -96,7 +90,8 @@
             <xs:element name="active" minOccurs="1" maxOccurs="1" type="xs:boolean"></xs:element>
             <xs:element name="visible" minOccurs="1" maxOccurs="1" type="xs:boolean"></xs:element>
             <xs:element name="starred" minOccurs="0" type="xs:boolean"></xs:element>
-            <xs:element name="refCall" minOccurs="0" type="refCallType"></xs:element>
+            <xs:element name="refCallLabel" minOccurs="0" type="xs:string"></xs:element>
+            <xs:element name="refCallParam" minOccurs="0" type="xs:string"></xs:element>
             <xs:element name="category" type="xs:integer"></xs:element>
             <xs:element name="operatorConfirmationNeeded" type="xs:boolean"></xs:element>
             <xs:element name="localizedNames">

Thermo.Active.Config/ServerConfigController.cs

@@ -518,8 +518,8 @@ namespace Thermo.Active.Config
                      IsActive = Convert.ToBoolean(x.Element("active").Value),
                      IsVisible = Convert.ToBoolean(x.Element("visible").Value),
                      IsStarred = x.Element("starred") != null ? Convert.ToBoolean(x.Element("starred").Value) : false,
-                     RefCallParam = x.Element("refCallParam") != null ? x.Element("refCallParam").Value : "",
                      RefCallLabel = x.Element("refCallLabel") != null ? x.Element("refCallLabel").Value : "",
+                     RefCallParam = x.Element("refCallParam") != null ? x.Element("refCallParam").Value : "",
                      Category = Convert.ToInt32(x.Element("category").Value),
                      LocalizedNames = x.Element("localizedNames").Elements().ToDictionary( // Read localized names and convert into a dictionary
                            y => y.Attribute("langKey").Value, y => y.Value
@@ -762,7 +762,8 @@ namespace Thermo.Active.Config
                                 SetpointThermo = 0,
                                 MaxPower = riferimento.Potenza,
                                 NumResist = 1,
-                                CalcIchMin = riferimento.Modello.Contains("Quarzo") || riferimento.Modello.Contains("Alogena")
+                                // 2020.07.27 applicato x tutti
+                                CalcIchMin = true //riferimento.Modello.Contains("Quarzo") || riferimento.Modello.Contains("Alogena")
                             });
                         }
                         else

Thermo.Active.Config/Thermo.Active.Config.csproj

@@ -88,7 +88,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Config\userSoftKeyConfig.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <SubType>Designer</SubType>
     </Content>
     <EmbeddedResource Include="Config\userSoftKeyConfigValidator.xsd">

Thermo.Active.Database/Controllers/UserSoftkeysController.cs

@@ -46,6 +46,8 @@ namespace Thermo.Active.Database.Controllers
                     Id = softKey.Id,
                     Category = softKey.Category,
                     OperatorConfirmationNeeded = softKey.OperatorConfirmationNeeded,
+                    RefCallLabel = softKey.RefCallLabel,
+                    RefCallParam = softKey.RefCallParam,
                     Type = softKey.Type,
                     SubKeys = tmpSubKey
                 });

Thermo.Active.Model/DTOModels/DTOUserSoftKeyModel.cs

@@ -8,6 +8,8 @@ namespace Thermo.Active.Model.DTOModels
         public int Id { get; set; }
         public int Category { get; set; }
         public bool OperatorConfirmationNeeded { get; set; }
+        public string RefCallParam { get; set; } = "";
+        public string RefCallLabel { get; set; } = "";
         public SOFTKEY_TYPE Type { get; set; }
         public Dictionary<int, string> SubKeys { get; set; }
     }

Thermo.Active.NC/NcAdapter.cs

@@ -2599,7 +2599,7 @@ namespace Thermo.Active.NC
             // check div0!
             if (VUMin == 0)
             {
-                VUMin = 210;
+                VUMin = 230;
             }
 
             // processo corrente minima!
@@ -2611,7 +2611,7 @@ namespace Thermo.Active.NC
                 minICh = 0;
                 if (item.CalcIchMin)
                 {
-                    calcPower = (item.NumResist - 1) + item.MaxPower + item.MaxPower / 2;
+                    calcPower = (item.NumResist - 1) * item.MaxPower + item.MaxPower / 2;
                     minICh = (double)calcPower / VUMin;
                 }
                 newFloatTData.Add(item.IdChannel, minICh);

Thermo.Active/Properties/AssemblyInfo.cs

@@ -30,4 +30,4 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("0.10.54")]
+[assembly: AssemblyVersion("0.10.56")]

Thermo.Active/wwwroot/assets/styles/base/paddle.less

@@ -11,9 +11,9 @@
   overflow: visible;
   background-color: #ddd;
   width: 1360px;
-  box-shadow: 2px 10px 15px 0 rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   transform: translateX(1360px);
-  transition: transform .3s ease-in-out;
+  transition: transform .3s .2s ease-in-out,box-shadow .3s linear;
   display: flex;
   align-items: stretch;
   justify-content: flex-start;
@@ -22,10 +22,14 @@
 
   &.open-full {
     transform: translateX(0);
+    box-shadow: 2px 10px 15px 0 rgba(0, 0, 0, 0.5);
+    transition: transform .1s ease-in-out,box-shadow .3s .1s linear;
   }
 
   &.open-half {
     transform: translateX(680px);
+    box-shadow: 2px 10px 15px 0 rgba(0, 0, 0, 0.5);
+    transition: transform .1s ease-in-out,box-shadow .3s .1s linear;
   }
 
   .paddleButton {
@@ -126,7 +130,7 @@
   width: 100%;
   height: 100px;
   border-radius: 2px;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.5);
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4);
   background-color: #808e96;
   cursor: pointer;
   color: #fff;
@@ -140,6 +144,8 @@
   justify-content: center;
   padding: 1rem;
   box-sizing: border-box;
+  border: none;
+  
 
   button.configure {
     position: absolute;
@@ -156,11 +162,38 @@
   &.active {
     box-shadow: inset 0px 0px 0px 3px #1791ff;
   }
+  &.pressed:active,
+  &:active  {
+    background-color: #57636b;
+  }
 }
 
 .starred-softkey {
+  box-sizing: border-box;
+  border-radius: 2px;
+  margin: 0 8px;
+  text-align: center;
+  font-size: 18px;
+  font-weight: bold;
+  box-shadow: none;
+  padding: 0 20px;
+  border: none;
+  background-image: linear-gradient(to bottom, @color-white2, @color-silver) !important;
+
+  &.pressed:active,
+  &:active  {
+    background-image: linear-gradient(to bottom, @color-silver, @color-white2) !important;
+  }
+  &.pressed {
+    background-image: linear-gradient(to bottom, @color-silver, @color-white2) !important;
+  }
+  
   &.active {
-    box-shadow: inset 0px 0px 0px 3px #1791ff;
+    box-shadow: inset 0px 0px 0px 3px #1791ff !important;
+  }
+
+  img{
+    -webkit-user-drag: none;
   }
 }
 

Thermo.Active/wwwroot/assets/styles/base/process-info.less

@@ -119,6 +119,9 @@
         color: @color-green;
     }
 
+    .black{
+      color: #4b4b4b;
+    }
     .content.READY,
     .status.READY{
         color: @color-clear-blue;

Thermo.Active/wwwroot/assets/styles/style.css

@@ -4761,9 +4761,9 @@ article .box .body {
   overflow: visible;
   background-color: #ddd;
   width: 1360px;
-  box-shadow: 2px 10px 15px 0 rgba(0, 0, 0, 0.5);
+  box-shadow: none;
   transform: translateX(1360px);
-  transition: transform 0.3s ease-in-out;
+  transition: transform 0.3s 0.2s ease-in-out, box-shadow 0.3s linear;
   display: flex;
   align-items: stretch;
   justify-content: flex-start;
@@ -4771,9 +4771,13 @@ article .box .body {
 }
 .paddle.open-full {
   transform: translateX(0);
+  box-shadow: 2px 10px 15px 0 rgba(0, 0, 0, 0.5);
+  transition: transform 0.1s ease-in-out, box-shadow 0.3s 0.1s linear;
 }
 .paddle.open-half {
   transform: translateX(680px);
+  box-shadow: 2px 10px 15px 0 rgba(0, 0, 0, 0.5);
+  transition: transform 0.1s ease-in-out, box-shadow 0.3s 0.1s linear;
 }
 .paddle .paddleButton {
   width: 40px;
@@ -4851,7 +4855,7 @@ article .box .body {
   width: 100%;
   height: 100px;
   border-radius: 2px;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.5);
+  box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4);
   background-color: #808e96;
   cursor: pointer;
   color: #fff;
@@ -4865,6 +4869,7 @@ article .box .body {
   justify-content: center;
   padding: 1rem;
   box-sizing: border-box;
+  border: none;
 }
 .softkey button.configure {
   position: absolute;
@@ -4880,8 +4885,34 @@ article .box .body {
 .softkey.active {
   box-shadow: inset 0px 0px 0px 3px #1791ff;
 }
+.softkey.pressed:active,
+.softkey:active {
+  background-color: #57636b;
+}
+.starred-softkey {
+  box-sizing: border-box;
+  border-radius: 2px;
+  margin: 0 8px;
+  text-align: center;
+  font-size: 18px;
+  font-weight: bold;
+  box-shadow: none;
+  padding: 0 20px;
+  border: none;
+  background-image: linear-gradient(to bottom, #f1f1f1, #bbbcbc) !important;
+}
+.starred-softkey.pressed:active,
+.starred-softkey:active {
+  background-image: linear-gradient(to bottom, #bbbcbc, #f1f1f1) !important;
+}
+.starred-softkey.pressed {
+  background-image: linear-gradient(to bottom, #bbbcbc, #f1f1f1) !important;
+}
 .starred-softkey.active {
-  box-shadow: inset 0px 0px 0px 3px #1791ff;
+  box-shadow: inset 0px 0px 0px 3px #1791ff !important;
+}
+.starred-softkey img {
+  -webkit-user-drag: none;
 }
 .box-softkeys-prefered-footer {
   height: 65px;
@@ -6716,6 +6747,9 @@ footer .container button.big:before {
 .process-info .status.RUN {
   color: #7ed321;
 }
+.process-info .black {
+  color: #4b4b4b;
+}
 .process-info .content.READY,
 .process-info .status.READY {
   color: #1791ff;

Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/softkey.ts

@@ -29,6 +29,7 @@ export default class SoftKey extends Vue {
 
   doclick() {
     if (!this.configMode && this.type != 0) this.$emit('click');
+    if (this.configMode) this.$emit('toggleFavourite');
   }
 
   get Checked() { return this.value; }

Thermo.Active/wwwroot/src/app_modules_thermo/components/paddle/softkey.vue

@@ -1,11 +1,11 @@
 <template>
-	<div class="softkey" @click="doclick()" :class="{ active: (active && type==1)}">
+	<button class="softkey" @click="doclick()" :class="{ active: (active && type==1)}">
 		<button class="configure" v-if="configMode" @click.prevent.stop="$emit('toggleFavourite')">
 			<i class="fa fa-plus" v-if="!isFavourite"></i>
 			<i class="fa fa-minus" v-if="isFavourite"></i>
 		</button>
 		<toggle-button v-if="type==0" v-model="Checked"></toggle-button>
 		{{title}}
-	</div>
+	</button>
 </template>
 <script src="./softkey.ts" lang="ts"></script>

Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.ts

@@ -51,27 +51,18 @@ export default class Processo extends Vue {
     this.starred = await dataService.GetStarredSoftKeysConfiguration();
   }
 
-  confirmationDelegate = null;
-  waitingForSftkConfirm = false;
   softKeyChanged(id, confirm) {
     if (!confirm)
       Hub.Current.sendUserSoftKey(id);
     else {
-      this.confirmationDelegate = () => {
-        Hub.Current.sendUserSoftKey(id);
-      };
-      this.waitingForSftkConfirm = true;
+      ModalHelper.AskConfirm( this.$options.filters.localize("", ""),
+                              this.$options.filters.localize("softkey_confirm", "Cancel"),
+                              () => {        
+                                Hub.Current.sendUserSoftKey(id);
+                              }, null, "modal");
     }
   }
 
-  sendKeyCancel() {
-    this.confirmationDelegate = null;
-  }
-  sendKeyConfirm() {
-    if (this.confirmationDelegate)
-      this.confirmationDelegate();
-    this.confirmationDelegate = null;
-  }
 
   getSoftKeyStatus(id) {
     return this.$store.getters.getSoftKeyStatus(id);

Thermo.Active/wwwroot/src/app_modules_thermo/processo/components/processo.vue

@@ -18,7 +18,7 @@
 						@checkChanged="softKeyChanged(b.id, b.operatorConfirmationNeeded)"
 					></soft-key>
 				</template>
-				<label>{{actual}}/{{tot}}</label>
+				<label><span v-if="tot">{{actual}}/{{tot}}</span></label>
 			</div>
 			<gantt
 				ref="gantt"

Thermo.Active/wwwroot/src/modules/app-header.vue

@@ -149,7 +149,8 @@
 		></button>
 		<div class="process-container over">
 			<process-info :status="state.cycleProd.status">
-				<strong>{{panel.nomeRicetta}}</strong>
+				<strong v-if="panel.nomeRicetta">{{panel.nomeRicetta}}</strong>
+				<strong v-else class="black"><i class="fa fa-exclamation-triangle"></i> {{'label_no_recipe' | localize("No Recipe loaded")}}</strong>
 			</process-info>
 		</div>
 		<button class="over blue" :title="'recipe_save' | localize('save')">