From ad9861d9949324698235d1dfd2ad6cfdbaeb37d3 Mon Sep 17 00:00:00 2001
From: rpm-mcarman <65228808+rpm-mcarman@users.noreply.github.com>
Date: Fri, 12 Jan 2024 15:41:44 -0500
Subject: [PATCH] Engine removal from db to be included as a model

---
 app/config/config.json         |   2 +-
 public/dmxAppConnect/config.js | 480 ++++++++++++++++-----------------
 views/dspec2.ejs               |   2 +-
 views/dspeckit.ejs             |  74 ++++-
 views/layouts/main.ejs         |   2 +-
 5 files changed, 301 insertions(+), 259 deletions(-)

diff --git a/app/config/config.json b/app/config/config.json
index 00bfe1c..48d79c6 100644
--- a/app/config/config.json
+++ b/app/config/config.json
@@ -6,6 +6,6 @@
     "methods": "GET,POST,DELETE,PATCH,PUT"
   },
   "env": {
-    "API_BASEURL": "http://vapor.prelub.com/api/v1.0/"
+    "API_BASEURL": "http://localhost:8080/api/v1.0/"
   }
 }
\ No newline at end of file
diff --git a/public/dmxAppConnect/config.js b/public/dmxAppConnect/config.js
index a6d2b18..0dda61d 100644
--- a/public/dmxAppConnect/config.js
+++ b/public/dmxAppConnect/config.js
@@ -12387,36 +12387,6 @@ dmx.config({
         "type": "array",
         "name": "data",
         "sub": [
-          {
-            "type": "object",
-            "name": "status",
-            "sub": [
-              {
-                "type": "text",
-                "name": "updatedate"
-              },
-              {
-                "type": "number",
-                "name": "id"
-              },
-              {
-                "type": "number",
-                "name": "updateuserid"
-              },
-              {
-                "type": "text",
-                "name": "createdate"
-              },
-              {
-                "type": "text",
-                "name": "name"
-              },
-              {
-                "type": "number",
-                "name": "createuserid"
-              }
-            ]
-          },
           {
             "type": "object",
             "name": "partnumber",
@@ -12441,11 +12411,11 @@ dmx.config({
               },
               {
                 "type": "text",
-                "name": "updatedate"
+                "name": "file"
               },
               {
                 "type": "text",
-                "name": "file"
+                "name": "updatedate"
               },
               {
                 "type": "number",
@@ -12489,6 +12459,10 @@ dmx.config({
                   }
                 ]
               },
+              {
+                "type": "text",
+                "name": "stdcost"
+              },
               {
                 "type": "object",
                 "name": "partcode",
@@ -12499,10 +12473,6 @@ dmx.config({
                   }
                 ]
               },
-              {
-                "type": "text",
-                "name": "stdcost"
-              },
               {
                 "type": "text",
                 "name": "listprice"
@@ -12513,11 +12483,11 @@ dmx.config({
               },
               {
                 "type": "text",
-                "name": "number"
+                "name": "ppap"
               },
               {
                 "type": "text",
-                "name": "ppap"
+                "name": "number"
               },
               {
                 "type": "object",
@@ -12571,40 +12541,22 @@ dmx.config({
             "type": "number",
             "name": "updateuserid"
           },
-          {
-            "type": "text",
-            "name": "voltage"
-          },
-          {
-            "type": "text",
-            "name": "revisionlevel"
-          },
           {
             "type": "text",
             "name": "startingserial"
           },
           {
             "type": "text",
-            "name": "motor"
+            "name": "voltage"
           },
           {
             "type": "text",
-            "name": "webpublish"
+            "name": "motor"
           },
           {
             "type": "text",
             "name": "arrangement"
           },
-          {
-            "type": "object",
-            "name": "make",
-            "sub": [
-              {
-                "type": "number",
-                "name": "id"
-              }
-            ]
-          },
           {
             "type": "text",
             "name": "electric"
@@ -12613,81 +12565,95 @@ dmx.config({
             "type": "text",
             "name": "type"
           },
-          {
-            "type": "text",
-            "name": "serialprefix"
-          },
           {
             "type": "number",
             "name": "id"
           },
           {
             "type": "text",
-            "name": "endingserial"
+            "name": "serialprefix"
           },
           {
-            "type": "object",
-            "name": "customer",
-            "sub": [
-              {
-                "type": "text",
-                "name": "updatedate"
-              },
-              {
-                "type": "number",
-                "name": "id"
-              },
-              {
-                "type": "number",
-                "name": "updateuserid"
-              },
-              {
-                "type": "text",
-                "name": "createdate"
-              },
-              {
-                "type": "text",
-                "name": "description"
-              },
-              {
-                "type": "text",
-                "name": "name"
-              },
-              {
-                "type": "number",
-                "name": "createuserid"
-              }
-            ]
+            "type": "text",
+            "name": "endingserial"
           },
           {
-            "type": "number",
-            "name": "universalkit"
+            "type": "boolean",
+            "name": "oe"
           },
           {
             "type": "object",
             "name": "model",
             "sub": [
+              {
+                "type": "text",
+                "name": "updatedate"
+              },
               {
                 "type": "object",
-                "name": "make",
+                "name": "product",
                 "sub": [
+                  {
+                    "type": "text",
+                    "name": "updatedate"
+                  },
                   {
                     "type": "number",
                     "name": "id"
+                  },
+                  {
+                    "type": "number",
+                    "name": "updateuserid"
+                  },
+                  {
+                    "type": "text",
+                    "name": "createdate"
+                  },
+                  {
+                    "type": "text",
+                    "name": "description"
+                  },
+                  {
+                    "type": "text",
+                    "name": "name"
+                  },
+                  {
+                    "type": "number",
+                    "name": "createuserid"
                   }
                 ]
               },
-              {
-                "type": "text",
-                "name": "updatedate"
-              },
               {
                 "type": "object",
-                "name": "product",
+                "name": "make",
                 "sub": [
+                  {
+                    "type": "text",
+                    "name": "updatedate"
+                  },
                   {
                     "type": "number",
                     "name": "id"
+                  },
+                  {
+                    "type": "number",
+                    "name": "updateuserid"
+                  },
+                  {
+                    "type": "text",
+                    "name": "createdate"
+                  },
+                  {
+                    "type": "text",
+                    "name": "description"
+                  },
+                  {
+                    "type": "text",
+                    "name": "name"
+                  },
+                  {
+                    "type": "number",
+                    "name": "createuserid"
                   }
                 ]
               },
@@ -12707,6 +12673,10 @@ dmx.config({
                 "type": "text",
                 "name": "description"
               },
+              {
+                "type": "text",
+                "name": "displacement"
+              },
               {
                 "type": "text",
                 "name": "name"
@@ -12725,102 +12695,44 @@ dmx.config({
                 "type": "text",
                 "name": "updatedate"
               },
-              {
-                "type": "number",
-                "name": "id"
-              },
               {
                 "type": "object",
-                "name": "model",
+                "name": "product",
                 "sub": [
+                  {
+                    "type": "text",
+                    "name": "updatedate"
+                  },
                   {
                     "type": "number",
                     "name": "id"
+                  },
+                  {
+                    "type": "number",
+                    "name": "updateuserid"
+                  },
+                  {
+                    "type": "text",
+                    "name": "createdate"
+                  },
+                  {
+                    "type": "text",
+                    "name": "description"
+                  },
+                  {
+                    "type": "text",
+                    "name": "name"
+                  },
+                  {
+                    "type": "number",
+                    "name": "createuserid"
                   }
                 ]
               },
               {
-                "type": "number",
-                "name": "updateuserid"
-              },
-              {
-                "type": "text",
-                "name": "createdate"
-              },
-              {
-                "type": "text",
-                "name": "description"
-              },
-              {
-                "type": "text",
-                "name": "displacement"
-              },
-              {
-                "type": "number",
-                "name": "createuserid"
-              }
-            ]
-          },
-          {
-            "type": "boolean",
-            "name": "oe"
-          },
-          {
-            "type": "object",
-            "name": "product",
-            "sub": [
-              {
-                "type": "text",
-                "name": "updatedate"
-              },
-              {
-                "type": "array",
-                "name": "models",
+                "type": "object",
+                "name": "make",
                 "sub": [
-                  {
-                    "type": "object",
-                    "name": "make",
-                    "sub": [
-                      {
-                        "type": "text",
-                        "name": "updatedate"
-                      },
-                      {
-                        "type": "number",
-                        "name": "id"
-                      },
-                      {
-                        "type": "number",
-                        "name": "updateuserid"
-                      },
-                      {
-                        "type": "text",
-                        "name": "createdate"
-                      },
-                      {
-                        "type": "text",
-                        "name": "description"
-                      },
-                      {
-                        "type": "text",
-                        "name": "name"
-                      },
-                      {
-                        "type": "number",
-                        "name": "createuserid"
-                      }
-                    ]
-                  },
-                  {
-                    "type": "object",
-                    "name": "product",
-                    "sub": [
-                      {
-                        "type": "number",
-                        "name": "id"
-                      }
-                    ]
-                  },
                   {
                     "type": "text",
                     "name": "updatedate"
@@ -12841,10 +12753,6 @@ dmx.config({
                     "type": "text",
                     "name": "description"
                   },
-                  {
-                    "type": "array",
-                    "name": "engines"
-                  },
                   {
                     "type": "text",
                     "name": "name"
@@ -12871,6 +12779,10 @@ dmx.config({
                 "type": "text",
                 "name": "description"
               },
+              {
+                "type": "text",
+                "name": "displacement"
+              },
               {
                 "type": "text",
                 "name": "name"
@@ -12923,21 +12835,9 @@ dmx.config({
         "type": "array",
         "name": "data",
         "sub": [
-          {
-            "type": "number",
-            "name": "id"
-          },
-          {
-            "type": "number",
-            "name": "createuserid"
-          },
-          {
-            "type": "number",
-            "name": "updateuserid"
-          },
           {
             "type": "text",
-            "name": "name"
+            "name": "updatedate"
           },
           {
             "type": "object",
@@ -13006,28 +12906,34 @@ dmx.config({
                 "name": "createuserid"
               }
             ]
-          }
-        ]
-      },
-      {
-        "type": "object",
-        "name": "headers",
-        "sub": [
+          },
+          {
+            "type": "number",
+            "name": "id"
+          },
+          {
+            "type": "number",
+            "name": "updateuserid"
+          },
           {
             "type": "text",
-            "name": "connection"
+            "name": "createdate"
           },
           {
             "type": "text",
-            "name": "content-length"
+            "name": "description"
           },
           {
             "type": "text",
-            "name": "content-type"
+            "name": "displacement"
           },
           {
             "type": "text",
-            "name": "date"
+            "name": "name"
+          },
+          {
+            "type": "number",
+            "name": "createuserid"
           }
         ]
       }
@@ -13354,33 +13260,45 @@ dmx.config({
     ],
     "api_postmodel": [
       {
-        "type": "array",
+        "type": "object",
         "name": "data",
         "sub": [
           {
-            "type": "number",
-            "name": "id"
+            "type": "text",
+            "name": "createdate"
           },
           {
-            "type": "number",
-            "name": "createuserid"
+            "type": "text",
+            "name": "name"
           },
           {
             "type": "number",
-            "name": "updateuserid"
+            "name": "createuserid"
           },
           {
-            "type": "text",
-            "name": "name"
+            "type": "number",
+            "name": "id"
           },
           {
             "type": "object",
             "name": "make",
             "sub": [
+              {
+                "type": "text",
+                "name": "createdate"
+              },
+              {
+                "type": "text",
+                "name": "description"
+              },
               {
                 "type": "text",
                 "name": "updatedate"
               },
+              {
+                "type": "number",
+                "name": "createuserid"
+              },
               {
                 "type": "number",
                 "name": "id"
@@ -13389,6 +13307,16 @@ dmx.config({
                 "type": "number",
                 "name": "updateuserid"
               },
+              {
+                "type": "text",
+                "name": "name"
+              }
+            ]
+          },
+          {
+            "type": "object",
+            "name": "product",
+            "sub": [
               {
                 "type": "text",
                 "name": "createdate"
@@ -13399,22 +13327,78 @@ dmx.config({
               },
               {
                 "type": "text",
-                "name": "name"
+                "name": "updatedate"
               },
               {
                 "type": "number",
                 "name": "createuserid"
+              },
+              {
+                "type": "number",
+                "name": "id"
+              },
+              {
+                "type": "number",
+                "name": "updateuserid"
+              },
+              {
+                "type": "text",
+                "name": "name"
               }
             ]
           },
+          {
+            "type": "text",
+            "name": "updatedate"
+          },
+          {
+            "type": "number",
+            "name": "updateuserid"
+          }
+        ]
+      }
+    ],
+    "api_postenginemodel": [
+      {
+        "type": "object",
+        "name": "data",
+        "sub": [
+          {
+            "type": "text",
+            "name": "createdate"
+          },
+          {
+            "type": "text",
+            "name": "name"
+          },
+          {
+            "type": "number",
+            "name": "createuserid"
+          },
+          {
+            "type": "number",
+            "name": "id"
+          },
           {
             "type": "object",
-            "name": "product",
+            "name": "make",
             "sub": [
+              {
+                "type": "text",
+                "name": "createdate"
+              },
+              {
+                "type": "text",
+                "name": "description"
+              },
               {
                 "type": "text",
                 "name": "updatedate"
               },
+              {
+                "type": "number",
+                "name": "createuserid"
+              },
               {
                 "type": "number",
                 "name": "id"
@@ -13423,6 +13407,16 @@ dmx.config({
                 "type": "number",
                 "name": "updateuserid"
               },
+              {
+                "type": "text",
+                "name": "name"
+              }
+            ]
+          },
+          {
+            "type": "object",
+            "name": "product",
+            "sub": [
               {
                 "type": "text",
                 "name": "createdate"
@@ -13433,35 +13427,33 @@ dmx.config({
               },
               {
                 "type": "text",
-                "name": "name"
+                "name": "updatedate"
               },
               {
                 "type": "number",
                 "name": "createuserid"
+              },
+              {
+                "type": "number",
+                "name": "id"
+              },
+              {
+                "type": "number",
+                "name": "updateuserid"
+              },
+              {
+                "type": "text",
+                "name": "name"
               }
             ]
-          }
-        ]
-      },
-      {
-        "type": "object",
-        "name": "headers",
-        "sub": [
-          {
-            "type": "text",
-            "name": "connection"
-          },
-          {
-            "type": "text",
-            "name": "content-length"
           },
           {
             "type": "text",
-            "name": "content-type"
+            "name": "updatedate"
           },
           {
-            "type": "text",
-            "name": "date"
+            "type": "number",
+            "name": "updateuserid"
           }
         ]
       }
diff --git a/views/dspec2.ejs b/views/dspec2.ejs
index 5e2fda4..f9cc3ac 100644
--- a/views/dspec2.ejs
+++ b/views/dspec2.ejs
@@ -62,7 +62,7 @@
 <dmx-api-action id="api_bompartselectbynumber" noload="true" url="http://vapor.prelub.com/api/v1.0/partnumbers/num/" dmx-bind:url="pg_apiurl.value.concat('partnumbers/num/'.concat(inp_bompartnumber.value))" dmx-on:success="inp_bomptdescription.setValue(api_bompartselectbynumber.data.description)"></dmx-api-action>
 <dmx-api-action id="api_loadexistingdspec" noload="true" url="http://vapor.prelub.com/api/v1.0/designspecs/max/106691" dmx-bind:url="pg_apiurl.value.concat('designspecs/max/'.concat(var_partid.value))" dmx-on:success="run([{run:{action:`var_dspecid.setValue(api_loadexistingdspec.data.id)`,outputType:'text'}},{run:{action:`api_loaddspec.load({})`,outputType:'text'}}])"></dmx-api-action>
 <dmx-api-action id="api_filteredpartcodes" noload="true" url="http://vapor.prelub.com/api/v1.0/partcodes/bytype/6" dmx-bind:url="pg_apiurl.value.concat('partcodes/bytype/'.concat(mdl_newpart.inp_parttypes.value))"></dmx-api-action>
-<dmx-api-action id="api_getnewpartinfo" noload="true" dmx-bind:url="pg_apiurl.value.concat('partnumbers/id/'.concat(var_partid.value))" dmx-on:success="run([{run:{action:`view_partnumber.setValue(api_getnewpartinfo.data.number)`,outputType:'text'}},{run:{action:`var_parttypeid.setValue(api_getnewpartinfo.data.partcode.parttype.id);var_partcodeid.setValue(api_getnewpartinfo.data.partcode.id);var_partnumber.setValue(api_getnewpartinfo.data.number);var_description.setValue(api_getnewpartinfo.data.description);var_comment.setValue(api_getnewpartinfo.data.comments)`,outputType:'text'}},{condition:{if:`query1.data.id`,then:{steps:{run:{action:`api_loadexistingdspec.load({})`,outputType:'text'}}},outputType:'boolean'}},{condition:{if:`(api_getnewpartinfo.data.partcode.parttype.id == 2)`,then:{steps:{run:{action:`browser1.goto(\'/dspeckit?id=\'+api_getnewpartinfo.data.id,true,\'New Kit\')`,outputType:'text'}}},else:{steps:{condition:{if:`(api_getnewpartinfo.data.partcode.parttype.id == 3)`,then:{steps:{run:{action:`browser1.goto(\'/dspeckit?id=\'+api_getnewpartinfo.data.id,true,\'New Kit\')`,outputType:'text'}}},outputType:'boolean'}}},outputType:'boolean'}}])"></dmx-api-action>
+<dmx-api-action id="api_getnewpartinfo" noload="true" dmx-bind:url="pg_apiurl.value.concat('partnumbers/id/'.concat(var_partid.value))" dmx-on:success="run([{run:{action:`view_partnumber.setValue(api_getnewpartinfo.data.number)`,outputType:'text'}},{run:{action:`var_parttypeid.setValue(api_getnewpartinfo.data.partcode.parttype.id);var_partcodeid.setValue(api_getnewpartinfo.data.partcode.id);var_partnumber.setValue(api_getnewpartinfo.data.number);var_description.setValue(api_getnewpartinfo.data.description);var_comment.setValue(api_getnewpartinfo.data.comments)`,outputType:'text'}},{condition:{if:`query1.data.id`,then:{steps:{run:{action:`api_loadexistingdspec.load({})`,outputType:'text'}}},outputType:'boolean'}},{condition:{if:`(api_getnewpartinfo.data.partcode.parttype.id == 2)`,then:{steps:{run:{action:`browser1.goto(\'/dspeckit?id=\'+api_getnewpartinfo.data.id,true,\'New Kit\')`,outputType:'text'}}},else:{steps:{condition:{if:`(api_getnewpartinfo.data.partcode.parttype.id == 3)`,then:{steps:{run:{action:`browser1.goto(\'/dspeckit?id=\'+api_getnewpartinfo.data.id,true,\'New Kit\')`,outputType:'text'}}},else:{steps:{condition:{if:`(api_getnewpartinfo.data.partcode.parttype.id == 4)`,then:{steps:{run:{action:`browser1.goto(\'/dspeckit?id=\'+api_getnewpartinfo.data.id,true,\'Kit\')`,outputType:'text'}}},outputType:'boolean'}}},outputType:'boolean'}}},outputType:'boolean'}}])"></dmx-api-action>
 <dmx-api-action id="api_getpartcodebyid" dmx-bind:url="pg_apiurl.value.concat('partcodes/'.concat(var_partcodeid.value))" noload="true" dmx-on:success="view_partcode.setValue(api_getpartcodebyid.data.name)"></dmx-api-action>
 <dmx-api-action id="api_getparttypebyid" noload="true" url="http://vapor.prelub.com/api/v1.0/parttypes/1" dmx-bind:url="pg_apiurl.value.concat('parttypes/'.concat(var_parttypeid.value))"></dmx-api-action>
 <dmx-api-action id="api_getexistingpartinfo" noload="true" dmx-bind:url="pg_apiurl.value.concat('partnumbers/id/'.concat(var_existingpartid.value))" dmx-on:success="var_partid.setValue(api_getnewpartinfo.data.id);view_partnumber.setValue(api_getnewpartinfo.data.number)"></dmx-api-action>
diff --git a/views/dspeckit.ejs b/views/dspeckit.ejs
index f169a04..96df40b 100644
--- a/views/dspeckit.ejs
+++ b/views/dspeckit.ejs
@@ -60,7 +60,6 @@
 <dmx-api-action id="api_bomcopyitem" noload="true" url="http://vapor.prelub.com/api/v1.0/boms/copy/33760/33758" method="put" data-type="json" dmx-bind:url="pg_apiurl.value.concat('boms/copy/'.concat(mod_cpybom.inp_cpynewdspecid.value.concat('/'.concat(mod_cpybom.inp_cpyolddspecid.value))))" dmx-on:success="api_loadbombydspec.load({},true)"></dmx-api-action>
 <dmx-api-action id="api_bompartselectbynumber" noload="true" url="http://vapor.prelub.com/api/v1.0/partnumbers/num/" dmx-bind:url="pg_apiurl.value.concat('partnumbers/num/'.concat(var_partsearch.value))"></dmx-api-action>
 <dmx-api-action id="api_customers" url="http://vapor.prelub.com/api/v1.0/customers" dmx-bind:url="pg_apiurl.value.concat('customers')"></dmx-api-action>
-<dmx-api-action id="api_engines" url="http://vapor.prelub.com/api/v1.0/engines" dmx-bind:url="pg_apiurl.value.concat('engines')"></dmx-api-action>
 
 
 <dmx-api-action id="api_loaddspec" noload="true" url="http://vapor.prelub.com/api/v1.0/designspecs/32458" dmx-bind:url="pg_apiurl.value.concat('designspecs/'.concat(var_dspecid.value))" dmx-on:success="api_loadbombydspec.load({});view_rev.setValue(api_loaddspec.data.revisionlevel);view_partcode.setValue(api_getnewpartinfo.data.partcode.name);view_obsolete.select((api_getnewpartinfo.data.status.id == 2));view_replacedby.setValue(api_getnewpartinfo.data.replacedby.number);view_description.setValue(api_getnewpartinfo.data.description);view_comments.setValue(api_getnewpartinfo.data.comments);inp_reasonforchange.setValue(api_loaddspec.data.reasonforchange);inp_validation.setValue(api_loaddspec.data.validation);inp_notes.setValue(api_loaddspec.data.note);api_getapps.load({})"></dmx-api-action>
@@ -124,13 +123,13 @@
                 <h5 class="modal-title">Application</h5>&nbsp;&nbsp;
                 &nbsp;&nbsp;
                 <a href="#" class="btn btn-sm btn-secondary" id="anc_newmodel" dmx-on:click="mod_newmodel.show()">New Model</a>&nbsp;&nbsp;
-                <a href="#" class="btn btn-sm btn-secondary" id="anc_newengine" dmx-on:click="mod_newengine.show()">New Engine</a><button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                <a href="#" class="btn btn-sm btn-secondary" id="anc_newengine" dmx-on:click="mod_newengine.show();mod_newengine.inp_newengineproduct.setValue(6);mod_newengine.inp_newengineproduct.disable(true)">New Engine</a><button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
             <div class="modal-body">
                 <div class="modal bg-secondary rounded-pill border-dark rounded-1" id="mod_newmodel" is="dmx-bs5-modal" tabindex="-1">
                     <div class="modal-dialog modal-dialog-centered" role="document">
                         <div class="modal-content">
-                            <dmx-api-action id="api_postmodel" noload="true" url="http://vapor.prelub.com/api/v1.0/models/insert" method="post" data-type="json" dmx-data:name="inp_newmodelname.value" dmx-data:makeid="inp_newmodelmake.value.toNumber()" dmx-data:productid="inp_newmodelproduct.value.toNumber()" dmx-data:description="null" dmx-data:createuserid="-1" dmx-data:updateuserid="-1" dmx-on:success="api_models.load({})" dmx-bind:url="pg_apiurl.value.concat('models')"></dmx-api-action>
+                            <dmx-api-action id="api_postmodel" noload="true" url="http://vapor.prelub.com/api/v1.0/models/insert" method="post" data-type="json" dmx-data:name="inp_newmodelname.value" dmx-data:makeid="inp_newmodelmake.value.toNumber()" dmx-data:productid="inp_newmodelproduct.value.toNumber()" dmx-data:description="null" dmx-data:createuserid="-1" dmx-data:updateuserid="-1" dmx-on:success="api_models.load({});var_newmodelid.setValue(api_postmodel.data.id);inp_appmodel.setValue(api_postmodel.data.id);mod_newmodel.hide();mod_confirmnewmodel.hide()" dmx-bind:url="pg_apiurl.value.concat('models')" dmx-data:displacement="null"></dmx-api-action>
                             <div class="modal-header">
                                 <h5 class="modal-title" id="mod_customer1">New Model</h5>
                                 <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
@@ -186,16 +185,63 @@
                 <div class="modal bg-secondary" id="mod_newengine" is="dmx-bs5-modal" tabindex="-1">
                     <div class="modal-dialog modal-dialog-centered" role="document">
                         <div class="modal-content">
+                            <dmx-api-action id="api_postenginemodel" noload="true" url="http://vapor.prelub.com/api/v1.0/models/insert" method="post" data-type="json" dmx-data:name="inp_newenginename.value" dmx-data:makeid="inp_newenginemake.value.toNumber()" dmx-data:productid="inp_newengineproduct.value.toNumber()" dmx-data:description="null" dmx-data:createuserid="-1" dmx-data:updateuserid="-1" dmx-on:success="api_models.load({});inp_appengine.setValue(api_postenginemodel.data.id);mod_confirmnewengine.hide();mod_newengine.hide()" dmx-bind:url="pg_apiurl.value.concat('models')" dmx-data:displacement="inp_newenginedisplacement.value"></dmx-api-action>
                             <div class="modal-header">
                                 <h5 class="modal-title" id="mod_customer2">New Engine</h5>
                                 <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                             </div>
                             <div class="modal-body">
-                                <p>Modal body text goes here.</p>
+                                <div class="modal" id="mod_confirmnewengine" is="dmx-bs5-modal" tabindex="-1">
+                                    <div class="modal-dialog modal-sm modal-dialog-centered" role="document">
+                                        <div class="modal-content">
+
+                                            <div class="modal-body">
+                                                <p class="lh-sm small text-center">Model already exists. Do you still wish to add it?</p>
+                                            </div>
+                                            <div class="modal-footer">
+                                                <button id="btn_yesengine" class="btn btn-success btn-sm" dmx-on:click="api_postenginemodel.load({})">YES</button>
+                                                <button id="btn_cancelengine" class="btn btn-danger btn-sm" dmx-on:click="mod_confirmnewengine.hide()">NO</button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="container">
+                                    <div class="row">
+                                        <div class="col" style="display: flex; width: 100%;">
+                                            <label>Displacement:</label>
+                                            <input id="inp_newenginename" name="newenginename" type="text" class="form-control">
+                                            &nbsp;&nbsp;
+
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col" style="display: flex; width: 100%;">
+                                            <label>Name:</label>
+                                            <input id="inp_newenginedisplacement" name="newenginedisplacement" type="text" class="form-control">
+                                            &nbsp;&nbsp;
+
+                                        </div>
+                                    </div>
+                                    <div class="row visually-hidden">
+                                        <div class="col" style="display: flex; width: 100%;">
+                                            <label>Product:</label>
+                                            <input id="inp_newengineproduct" name="inpnewengineproduct" type="text" class="form-control" is="dmx-autocomplete" dmx-bind:data="api_products.data" optiontext="name" optionvalue="id" optionsearch="name">&nbsp;&nbsp;
+
+                                        </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col" style="display: flex; width: 100%;">
+                                            <label>Make:</label>
+                                            <input id="inp_newenginemake" name="inpnewenginemake" type="text" class="form-control" is="dmx-autocomplete" dmx-bind:data="api_makes.data" optiontext="name" optionvalue="id" optionsearch="name">&nbsp;&nbsp;
+
+                                        </div>
+                                    </div>
+
+                                </div>
                             </div>
                             <div class="modal-footer">
                                 <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-                                <button type="button" class="btn btn-primary">Save changes</button>
+                                <button type="button" class="btn btn-primary" dmx-on:click="run({condition:{if:`api_models.data.where(\`name\`, inp_newenginename.value, \'==\')`,then:{steps:{run:{action:`mod_confirmnewengine.show()`,outputType:'text'}}},else:{steps:{run:{action:`api_postenginemodel.load({})`,outputType:'text'}}},outputType:'boolean'}})">Save changes</button>
                             </div>
                         </div>
                     </div>
@@ -205,9 +251,9 @@
                     <div class="align-self-center col-4" style="display: flex; width: 100%;">
 
                         <label style="padding: 10px;">Model:</label>
-                        <input id="inp_appmodel" name="inpappmodel" type="text" class="form-control" is="dmx-autocomplete" dmx-bind:data="api_models.data" optiontext="name" optionvalue="id" optionsearch="name" style="padding: 10px;">
+                        <input id="inp_appmodel" name="inpappmodel" type="text" class="form-control" is="dmx-autocomplete" dmx-bind:data="api_models.data.where(`product.id`, 6, '!=')" optiontext="name" optionvalue="id" optionsearch="name" style="padding: 10px;">
                         <label style="padding: 10px;">Engine:</label>
-                        <input id="inp_appengine" name="inpappengine" type="text" class="form-control" is="dmx-autocomplete" dmx-bind:data="api_engines.data" optiontext="displacement" optionvalue="id" optionsearch="displacement" style="padding: 10px;">
+                        <input id="inp_appengine" name="inpappengine" type="text" class="form-control" is="dmx-autocomplete" dmx-bind:data="api_models.data.where(`product.id`, 6, '==')" optiontext="name" optionvalue="id" optionsearch="name" style="padding: 10px;">
 
                     </div>
                 </div>
@@ -623,10 +669,12 @@
                             <thead>
                                 <tr>
                                     <th scope="row">Action</th>
-                                    <th>Startingserial</th>
-                                    <th>Type</th>
                                     <th>Serialprefix</th>
+                                    <th>Startingserial</th>
                                     <th>Endingserial</th>
+                                    <th>Type</th>
+
+
                                     <th>Model</th>
                                     <th>Product</th>
                                     <th>Description</th>
@@ -638,12 +686,14 @@
                                         <button id="btn_viewapp" class="btn btn-primary btn-sm" dmx-bind:value="id" dmx-on:click="var_appid.setValue(value)">View</button>
                                         <button id="btn_deleteapp" class="btn btn-danger btn-sm" dmx-bind:value="id" dmx-on:click="var_deleteapp.setValue(value)">X</button>
                                     </td>
-                                    <td dmx-text="startingserial"></td>
-                                    <td dmx-text="type"></td>
                                     <td dmx-text="serialprefix"></td>
+                                    <td dmx-text="startingserial"></td>
                                     <td dmx-text="endingserial"></td>
+                                    <td dmx-text="type"></td>
+
+
                                     <td dmx-text="model.name"></td>
-                                    <td dmx-text="product.name"></td>
+                                    <td dmx-text="model.product.name"></td>
                                     <td dmx-text="description"></td>
                                 </tr>
                             </tbody>
diff --git a/views/layouts/main.ejs b/views/layouts/main.ejs
index ad089af..0fda708 100644
--- a/views/layouts/main.ejs
+++ b/views/layouts/main.ejs
@@ -48,7 +48,7 @@
 <body is="dmx-app" id="main">
   <div class="container">
     <dmx-value id="var_userinfo"></dmx-value>
-    <dmx-value id="pg_apiurl" dmx-bind:value="'http://vapor.prelub.com/api/v1.0/'"></dmx-value>
+    <dmx-value id="pg_apiurl" dmx-bind:value="'http://localhost:8080/api/v1.0/'"></dmx-value>
     <nav class="navbar navbar-expand-lg navbar-light bg-light">
       <div class="container-fluid">
         <a class="navbar-brand" href="#">RPM Studio</a>