diff --git a/Thermo.Active/wwwroot/assets/styles/base/setup.less b/Thermo.Active/wwwroot/assets/styles/base/setup.less
index 4433241a..bafa057e 100644
--- a/Thermo.Active/wwwroot/assets/styles/base/setup.less
+++ b/Thermo.Active/wwwroot/assets/styles/base/setup.less
@@ -12,14 +12,14 @@
width: 100vw;
height: 100vh;
- .notes_textarea{
+ .notes_textarea {
box-sizing: border-box;
resize: none;
display: block;
border-radius: 2px;
border: solid 1px #dfdfdf;
height: 120px;
- font-family: 'Work Sans', sans-serif;
+ font-family: "Work Sans", sans-serif;
color: #4b4b4b;
font-size: 16px;
background-color: #f8f8f8;
@@ -32,7 +32,7 @@
}
}
- .select_folder{
+ .select_folder {
height: 48px;
background-color: #fff;
padding: 0 20px;
@@ -51,7 +51,7 @@
cursor: pointer;
}
- .description_lbl{
+ .description_lbl {
margin-top: 22px;
font-size: 14px;
color: #878787;
@@ -79,6 +79,10 @@
font-weight: bold;
border-top: 2px solid #002680;
}
+
+ &.error {
+ border-top: 4px solid #d0021b;
+ }
}
}
@@ -96,7 +100,7 @@
height: 980px;
section.body {
- height: calc(~'100% - 66px');
+ height: calc(~"100% - 66px");
section {
height: 100%;
@@ -106,8 +110,8 @@
padding: 14px;
display: flex;
justify-content: flex-start;
- width: calc(~'100% - 28px');
- height: calc(~'100% - 28px - 82px');
+ width: calc(~"100% - 28px");
+ height: calc(~"100% - 28px - 82px");
.auto {
overflow-y: auto;
@@ -133,7 +137,7 @@
margin-left: 0px;
}
- .notEnabled{
+ .notEnabled {
position: absolute;
top: 0;
left: 0;
@@ -146,12 +150,11 @@
display: flex;
justify-content: center;
align-items: center;
- &.small{
+ &.small {
margin-top: 55px;
height: 90%;
}
}
-
}
article {
@@ -161,7 +164,7 @@
// align-items: center;
position: relative;
- .notEnabled{
+ .notEnabled {
position: absolute;
top: 0;
left: 0;
@@ -187,7 +190,6 @@
justify-content: space-evenly;
align-items: center;
-
img {
flex-shrink: 0;
width: 215px;
@@ -199,7 +201,6 @@
.imgborder {
border: 1px solid @color-darkish-blue;
}
-
}
.svg-area {
@@ -211,7 +212,7 @@
flex: 1;
flex-flow: column;
align-items: center;
- .small-img{
+ .small-img {
position: absolute;
right: 0;
bottom: 0;
@@ -219,22 +220,22 @@
max-height: 200px;
}
- .ventosa{
- color: #FFFF;
- display: flex;
- justify-content: center;
- align-items: center;
- width: 100%;
- height: 100%;
+ .ventosa {
+ color: #ffff;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ width: 100%;
+ height: 100%;
}
- .volantino{
+ .volantino {
height: 48px;
width: 48px;
position: absolute;
bottom: 101px;
left: 100px;
}
- .quota-volantino{
+ .quota-volantino {
height: 48px;
width: 169px;
position: absolute;
@@ -244,7 +245,7 @@
align-items: center;
font-size: 1.2em;
}
- .quota-caricatore{
+ .quota-caricatore {
height: 48px;
width: 169px;
position: absolute;
@@ -255,7 +256,7 @@
justify-content: flex-end;
font-size: 1.2em;
}
- .load-label{
+ .load-label {
width: 100%;
text-align: center;
font-size: 2em;
@@ -278,7 +279,7 @@
position: absolute;
background-color: white;
- &.noteditable{
+ &.noteditable {
border-radius: 0;
border: none;
padding: 4px 2px;
@@ -290,7 +291,7 @@
color: white;
}
- &.error{
+ &.error {
border-color: #d0021b;
}
@@ -319,9 +320,7 @@
align-items: center;
justify-content: flex-end;
}
-
}
-
}
img {
@@ -353,13 +352,11 @@
}
}
-
.divider {
width: 100%;
height: 20px;
}
-
.modal-footer-navigator {
position: absolute;
bottom: 0;
@@ -378,7 +375,6 @@
grid-template-columns: 40px 1fr;
&.current {
-
.background-top,
.background-bottom {
background-color: #d3d3d3;
@@ -389,11 +385,11 @@
}
.background-top {
- box-shadow: -3px 5px 5px rgba(0, 0, 0, .2) inset;
+ box-shadow: -3px 5px 5px rgba(0, 0, 0, 0.2) inset;
}
.background-bottom {
- box-shadow: -3px -5px 5px rgba(0, 0, 0, .2) inset;
+ box-shadow: -3px -5px 5px rgba(0, 0, 0, 0.2) inset;
}
}
@@ -414,11 +410,11 @@
border-radius: 7px;
&.fa-check-circle {
- color: #90BF3D;
+ color: #90bf3d;
}
&.fa-check-circle.undone-step {
- color: #1791FF;
+ color: #1791ff;
}
}
@@ -430,7 +426,6 @@
align-items: center;
font-size: 14px;
font-weight: bold;
- ;
}
label {
@@ -449,7 +444,6 @@
font-weight: bold;
color: darkblue;
}
-
}
.modal.setup-info {
@@ -464,9 +458,9 @@
height: 100%;
.Rectangle {
- width: calc(~'100% - 200px');
- height: calc(~'100% - 200px');
- background-color: #BBBCBC;
+ width: calc(~"100% - 200px");
+ height: calc(~"100% - 200px");
+ background-color: #bbbcbc;
display: grid;
grid-template-columns: repeat(6, 1fr);
grid-template-rows: 1fr 1fr;
@@ -474,7 +468,6 @@
justify-items: center;
padding: 100px;
}
-
}
}
@@ -514,11 +507,9 @@
grid-row: 2;
z-index: 2;
margin: auto;
-
}
-
- i {
+ i {
position: absolute;
bottom: 6px;
left: 93px;
@@ -527,11 +518,11 @@
font-size: 36px;
&.fa-check-circle {
- color: #90BF3D;
+ color: #90bf3d;
}
&.fa-check-circle.undone-step {
- color: #1791FF;
+ color: #1791ff;
}
}
@@ -539,7 +530,6 @@
.background-top,
.background-bottom {
-
position: absolute;
left: 0;
width: 100%;
@@ -570,8 +560,6 @@
bottom: 0;
transform: skewX(-20deg);
}
-
-
}
article {
@@ -580,7 +568,6 @@ article {
}
}
-
.box {
margin-bottom: 20px;
box-sizing: border-box;
@@ -655,16 +642,11 @@ article {
text-align: center;
color: @color-darkish-blue;
}
-
}
-
}
-
-
-
.setup-play {
cursor: pointer;
margin: auto;
display: flex;
-}
\ No newline at end of file
+}
diff --git a/Thermo.Active/wwwroot/assets/styles/style.css b/Thermo.Active/wwwroot/assets/styles/style.css
index cc9a5d2e..4f672f6f 100644
--- a/Thermo.Active/wwwroot/assets/styles/style.css
+++ b/Thermo.Active/wwwroot/assets/styles/style.css
@@ -17,7 +17,7 @@
border-radius: 2px;
border: solid 1px #dfdfdf;
height: 120px;
- font-family: 'Work Sans', sans-serif;
+ font-family: "Work Sans", sans-serif;
color: #4b4b4b;
font-size: 16px;
background-color: #f8f8f8;
@@ -74,6 +74,9 @@
font-weight: bold;
border-top: 2px solid #002680;
}
+.setup .tab-header button.error {
+ border-top: 4px solid #d0021b;
+}
.setup hr {
flex-shrink: 0;
background-color: #979797;
@@ -197,7 +200,7 @@
max-height: 200px;
}
.setup .modal section.body section article .svg-area .ventosa {
- color: #FFFF;
+ color: #ffff;
display: flex;
justify-content: center;
align-items: center;
@@ -364,10 +367,10 @@
border-radius: 7px;
}
.setup .modal-footer-navigator .setup-button i.fa-check-circle {
- color: #90BF3D;
+ color: #90bf3d;
}
.setup .modal-footer-navigator .setup-button i.fa-check-circle.undone-step {
- color: #1791FF;
+ color: #1791ff;
}
.setup .modal-footer-navigator .setup-button span,
.setup .modal-footer-navigator .setup-button label {
@@ -403,7 +406,7 @@
.modal.setup-info section .Rectangle {
width: calc(100% - 200px);
height: calc(100% - 200px);
- background-color: #BBBCBC;
+ background-color: #bbbcbc;
display: grid;
grid-template-columns: repeat(6, 1fr);
grid-template-rows: 1fr 1fr;
@@ -455,10 +458,10 @@
font-size: 36px;
}
.setup-button i.fa-check-circle {
- color: #90BF3D;
+ color: #90bf3d;
}
.setup-button i.fa-check-circle.undone-step {
- color: #1791FF;
+ color: #1791ff;
}
.setup-button .background-top,
.setup-button .background-bottom {
diff --git a/Thermo.Active/wwwroot/config.development.json b/Thermo.Active/wwwroot/config.development.json
index f8091c43..58460cb5 100644
--- a/Thermo.Active/wwwroot/config.development.json
+++ b/Thermo.Active/wwwroot/config.development.json
@@ -2,7 +2,7 @@
"env": "development",
"api": {
"enabled": true,
- "apiServerUrl": "http://localhost:9000/"
+ "apiServerUrl": "http://seriate.steamware.net:9000/"
},
"allUIVisible": false
}
\ No newline at end of file
diff --git a/Thermo.Active/wwwroot/index.html b/Thermo.Active/wwwroot/index.html
index c1a1097d..f018a3b8 100644
--- a/Thermo.Active/wwwroot/index.html
+++ b/Thermo.Active/wwwroot/index.html
@@ -13,7 +13,7 @@
-
+
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.ts b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.ts
index 6af2b5bf..c4a50a94 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.ts
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.ts
@@ -40,6 +40,35 @@ export default class ShowCicloInfo extends Vue {
};
+ get formingHasErrors() {
+ return (this.recipe.cycle_forming_type.status.visible && this.recipe.cycle_forming_type.status.hasError) ||
+ (this.recipe.cycle_forming_pause_cycle.status.visible && this.recipe.cycle_forming_pause_cycle.status.hasError) ||
+ (this.recipe.cycle_forming_cooling_enabled.status.visible && this.recipe.cycle_forming_cooling_enabled.status.hasError) ||
+ (this.recipe.cycle_forming_blowingbox_enabled.status.visible && this.recipe.cycle_forming_blowingbox_enabled.status.hasError) ||
+ (this.recipe.cycle_acrylicframe_enabled.status.visible && this.recipe.cycle_acrylicframe_enabled.status.hasError) ||
+ (this.recipe.cycle_acrylicframe_time.status.visible && this.recipe.cycle_acrylicframe_time.status.hasError) ||
+ (this.recipe.cycle_upperoverheating_enabled.status.visible && this.recipe.cycle_upperoverheating_enabled.status.hasError) ||
+ (this.recipe.cycle_upperoverheating_time.status.visible && this.recipe.cycle_upperoverheating_time.status.hasError) ||
+ (this.recipe.cycle_crystallisation_type.status.visible && this.recipe.cycle_crystallisation_type.status.hasError) ||
+ (this.recipe.cycle_crystallisation_time.status.visible && this.recipe.cycle_crystallisation_time.status.hasError);
+ }
+
+ get loaderHasErrors() {
+ return (this.recipe.cycle_loader_enable.status.visible && this.recipe.cycle_loader_enable.status.hasError) ||
+ (this.recipe.cycle_loader_lifter_lowerposition_delay.status.visible && this.recipe.cycle_loader_lifter_lowerposition_delay.status.hasError) ||
+ (this.recipe.cycle_loader_lifter_upperposition_delay.status.visible && this.recipe.cycle_loader_lifter_upperposition_delay.status.hasError) ||
+ (this.recipe.cycle_loader_split_sheet_time.status.visible && this.recipe.cycle_loader_split_sheet_time.status.hasError) ||
+ (this.recipe.cycle_loader_ejector_position.status.visible && this.recipe.cycle_loader_ejector_position.status.hasError) ||
+ (this.recipe.cycle_loader_pallet_height.status.visible && this.recipe.cycle_loader_pallet_height.status.hasError) ||
+ (this.recipe.cycle_loader_center_x.status.visible && this.recipe.cycle_loader_center_x.status.hasError) ||
+ (this.recipe.cycle_loader_center_y.status.visible && this.recipe.cycle_loader_center_y.status.hasError) ||
+ (this.recipe.cycle_loader_checktichness_enabled.status.visible && this.recipe.cycle_loader_checktichness_enabled.status.hasError) ||
+ (this.recipe.cycle_loader_suckers_vacuum.status.visible && this.recipe.cycle_loader_suckers_vacuum.status.hasError) ||
+ (this.recipe.cycle_loader_ionizer_enabled.status.visible && this.recipe.cycle_loader_ionizer_enabled.status.hasError) ||
+ (this.recipe.cycle_loader_manualunloading_enabled.status.visible && this.recipe.cycle_loader_manualunloading_enabled.status.hasError);
+ }
+
+
get payload() {
return {
cycle_forming_type: this.recipe.cycle_forming_type,
@@ -75,7 +104,7 @@ export default class ShowCicloInfo extends Vue {
debouncedRecipeSave = debounce(async () => await recipeService.Update(this.payload), 200);
-
+
hasErrors() {
let payload = this.recipe;
let errors = false;
@@ -107,9 +136,9 @@ export default class ShowCicloInfo extends Vue {
}
return result;
}
-
+
takeScreenshot() {
- messageService.publishToChannel("take-screenshot");
+ messageService.publishToChannel("take-screenshot");
}
isLoaderEnabled() {
@@ -146,7 +175,7 @@ export default class ShowCicloInfo extends Vue {
async conferma() {
// recipeActions.setCurrent(store, this.recipe);
-
+
this.isLoading = true;
await recipeService.Confirm('Cycle');
this.isLoading = false;
diff --git a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.vue b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.vue
index 95cbb094..cd3aaa10 100644
--- a/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.vue
+++ b/Thermo.Active/wwwroot/src/app_modules_thermo/setup/ciclo/components/show-ciclo-info.vue
@@ -3,11 +3,11 @@