Merge branch 'Production' of https://github.itap.purdue.edu/Bechtel-I…

…nnovation-Design-Center/PostUpdateProject into Production
Bechtel-Innovation-Design-Center · Sep 27, 2021 · e66b8d3 · e66b8d3
2 parents 63a2274 + 63efe81
commit e66b8d3
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 23 deletions.
diff --git a/Autodesk_Setup_BIDC/setup-sheet.cps b/Autodesk_Setup_BIDC/setup-sheet.cps
@@ -32,7 +32,7 @@ properties = {
     title: "Embed stylesheet",
     description: "Embeds the stylesheet in the HTML code.",
     type: "boolean",
-    value: true,
+    value: false,
     scope: "post"
   },
   useUnitSymbol: {

diff --git a/Autodesk_Setup_BIDC/setup-sheet.css b/Autodesk_Setup_BIDC/setup-sheet.css
@@ -4,14 +4,17 @@
   All rights reserved
 */
 
+@import url("https://use.typekit.net/sgs7pgb.css");
+
 body {
-  background-color: White;
-  font-family: Arial, Helvetica, sans-serif;
+  background-color: #CFB991;
+  font-family: acumin-pro, 'Franklin Gothic', sans-serif;
 }
 
 h1 {
-  font-size: 15pt;
+  font-size: 2.5rem;
   text-align: center;
+  font-weight: 700;
 }
 
 h2 {
@@ -29,20 +32,23 @@ h3.section {
 table {
   border: none;
   border-spacing: 0;
+  background-color: white;
 }
 
 table.jobhead {
   width: 18cm;
+  background-color: #CFB991;
 }
 
 table.job, table.sheet {
   width: 18cm;
-  border: thin solid Gray;
+  border: medium solid Black;
 }
 
 th {
   background-color: #e0e0e0;
-  border-bottom: 1px solid Gray;
+  border-bottom: medium solid Black;
+  padding: 0.7rem;
 }
 
 tr.space td {
@@ -78,6 +84,7 @@ tr {
   padding-top: 30px;
   padding-bottom: 20px;
   white-space: nowrap;
+  font-size: 1.5625rem;
 }
 
 .even td {
@@ -94,7 +101,7 @@ tr {
 }
 
 td {
-  font-size: 9pt;
+  font-size: 1.125rem;
   vertical-align: top;
 }
 
@@ -112,7 +119,8 @@ td.image {
 
 pre {
   padding-left: 0.5cm;
-  font-size: 8pt;
+  font-size: 1.125rem;
+  font-style: italic;
 }
 
 p {
@@ -124,18 +132,19 @@ p {
 
 .jobhead td .description {
   display: inline;
-  font-variant: small-caps;
+  font-variant: normal;
 }
 
 td .description {
-  font-size: 8pt;
+  font-size: 1.125rem;
   display: inline;
-  font-variant: small-caps;
+  font-variant: normal;
+  font-weight: bold;
 }
 
 .value {
   display: inline;
-  font-family: Geneva, sans-serif;
+  font-family: acumin-pro, sans-serif;
   color: #606060;
 }
 
@@ -176,9 +185,9 @@ path.cutter {
 }
 
 path.holderIE {
-  stroke-width: 0; // non-scaling not worker
+  stroke-width: 0;
 }
 
 path.cutterIE {
-  stroke-width: 0; // non-scaling not worker
+  stroke-width: 0;
 }
diff --git a/Flow_Waterjet_BIDC/Bechtel Waterjet.cps b/Flow_Waterjet_BIDC/Bechtel Waterjet.cps
@@ -482,4 +482,4 @@ function onClose() {
 
 function setProperty(property, value) {
   properties[property].current = value;
-}
+}
diff --git a/Haas_Gantry_BIDC/Bechtel SR.cps b/Haas_Gantry_BIDC/Bechtel SR.cps
@@ -868,10 +868,10 @@ function onOpen() {
         var tool = tools.getTool(i);
         // Added 8/31/21 | Kevin Pan | pan261
         if (tool.number == 1) {
-          // throw "Tool number 1 is reserved for probing."
+          throw "Tool number 1 is reserved for probing."
         }
         if (tool.number == 2) {
-          // throw "Tool number 2 is not available for use."
+          throw "Tool number 2 is not available for use."
         }
         // pan261
 
@@ -1851,13 +1851,20 @@ function onSection() {
     }
   }
 
-  if (!isFirstSection()) {
+  if (!isFirstSection() && getProperty("toolHeightValidation")) {
     writeBlock(mFormat.format(0));
     writeComment("CHECK TOOL AND PART");
     if (!retracted) {
       writeRetract(Z);
     }
     writeRetract(X, Y);
+  } else if(!isFirstSection()) {
+    writeBlock(mFormat.format(1));
+    writeComment("CHECK TOOL AND PART");
+    if (!retracted) {
+      writeRetract(Z);
+    }
+    writeRetract(X, Y);
   }
 
   if (hasParameter("operation-comment")) {
@@ -1874,7 +1881,7 @@ function onSection() {
   }
 
   if (hasParameter("notes") && getParameter("notes").toUpperCase().indexOf("APPROVED") <= -1) {
-    // throw "Operation \"" + getParameter("operation-comment") + "\" not approved. See a Peer Mentor."
+    throw "Operation \"" + getParameter("operation-comment") + "\" not approved. See a Peer Mentor."
   }
 
   if (staticProperties.showNotes) {

diff --git a/Haas_Mills_BIDC/Bechtel DT.cps b/Haas_Mills_BIDC/Bechtel DT.cps
@@ -2421,12 +2421,15 @@ function onSection() {
     }
   }
 
-  if (!isFirstSection()) {
+  if (!isFirstSection() && getProperty("toolLengthValidation")) {
     displayMedia("checkPartTool.jpg", false);
     writeBlock(mFormat.format(0));
     writeBlock(mFormat.format(131));
+  } else if (!isFirstSection()) {
+    writeBlock(mFormat.format(1));
+    writeComment("Check Part and Tool");
   }
-
+  
   if (hasParameter("operation-comment")) {
     var comment = getParameter("operation-comment");
     if (comment && ((comment !== lastOperationComment) || !patternIsActive || insertToolCall)) {

diff --git a/Haas_Mills_BIDC/Bechtel VF2.cps b/Haas_Mills_BIDC/Bechtel VF2.cps
@@ -2421,10 +2421,13 @@ function onSection() {
     }
   }
 
-  if (!isFirstSection()) {
+  if (!isFirstSection() && getProperty("toolLengthValidation")) {
     displayMedia("checkPartTool.jpg", false);
     writeBlock(mFormat.format(0));
     writeBlock(mFormat.format(131));
+  } else if (!isFirstSection()) {
+    writeBlock(mFormat.format(1));
+    writeComment("Check Part and Tool");
   }
 
   if (hasParameter("operation-comment")) {

diff --git a/Haas_Mills_BIDC/Bechtel VF4.cps b/Haas_Mills_BIDC/Bechtel VF4.cps
@@ -2425,10 +2425,13 @@ function onSection() {
     }
   }
 
-  if (!isFirstSection()) {
+  if (!isFirstSection() && getProperty("toolLengthValidation")) {
     displayMedia("checkPartTool.jpg", false);
     writeBlock(mFormat.format(0));
     writeBlock(mFormat.format(131));
+  } else if (!isFirstSection()) {
+    writeBlock(mFormat.format(1));
+    writeComment("Check Part and Tool");
   }
 
   if (hasParameter("operation-comment")) {