#1 more updates

CapsicoHealth · Oct 16, 2022 · 58aba8b · 58aba8b
1 parent 905c358
commit 58aba8b
Show file tree

Hide file tree

Showing 18 changed files with 475 additions and 179 deletions.
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
@@ -4105,17 +4105,15 @@
     <mime-type>application/vnd.handheld-entertainment+xml</mime-type>
   </mime-mapping>
 
-<!-- 
   <filter>
     <filter-name>SessionFilter</filter-name>
-    <filter-class>wanda.web.SessionFilter</filter-class>
+    <filter-class>wanda.web.SessionFilterNonTransactional</filter-class>
   </filter>
   <filter-mapping>
     <filter-name>SessionFilter</filter-name>
     <url-pattern>*.jsp</url-pattern>
     <url-pattern>/svc/*</url-pattern>
   </filter-mapping>
--->
 
   <security-constraint>
     <web-resource-collection>

diff --git a/WebContent/index.html b/WebContent/index.html
@@ -2,7 +2,7 @@
 <html>
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title>Tilda Workbench</title>
+    <title>TIDE: Tilda Workbench</title>
     <link rel="stylesheet" href="/static/dojo-release-1.16.4/dijit/themes/claro/claro.css"/>
     <link rel="stylesheet" href="/static/css/dojoSimple.css"/>
     <link rel="stylesheet" href="/static/css/tilda.css"/>
@@ -15,23 +15,33 @@
   <HEADER id="MAINCONTAINER_HEADER">
     <TABLE width="100%" border="0px" cellspacing="0px" cellpadding="0px">
       <TR><TD id="HEADER_LOGO"><A href="/index.html"><IMG src="/static/img/tilda-logo.gif"></A></TD>
-          <TD id="HEADER_TITLE">Tilda Workbench</TD>
+          <TD id="HEADER_TITLE">TIDE</TD>
       </TR>
     </TABLE>
   </HEADER>
 
-  <MAIN id="MAINCONTAINER_BODY">
-    <DIV class="column left"  style="top:75px; bottom:75px; left:15%; width:70%; overflow-x:hidden; overflow-y:auto; scrollbar-width:thin;">
-      <DIV class="tileHeader360g">Projects <A href="javascript:TILDA_GLOBAL.projects.addProject();"><IMG src="/static/img/add.gif"></A>
-                                           <span class="searchBox">
-                                              <input class="searchInput" type="text" name="" placeholder="Search">
-                                           </span>
-<!--                                            <A href="javascript:TILDA_GLOBAL.projects.searchProject();"><IMG src="/static/img/search.gif"></A>
- -->
+  <MAIN id="MAINCONTAINER_PROJECTS" class="mainContainerBody">
+    <DIV id="PROJECTS" class="column left"  style="top:75px; bottom:75px; left:15%; width:70%; overflow-x:hidden; overflow-y:auto; scrollbar-width:thin;">
+      <DIV class="tileHeader360g">
+         Projects <A href="javascript:TILDA_GLOBAL.addProject();"><IMG src="/static/img/add.gif"></A>
+                  <span class="searchBox"><input class="searchInput" type="text" name="" placeholder="Search"></span>
       </DIV>
       <DIV id="PROJECT_LIST" class="tileGroup360g"><IMG src="/static/img/progress.gif"></DIV>
     </DIV>
   </MAIN>
+
+  <MAIN id="MAINCONTAINER_SCHEMAS"  class="mainContainerBody" style="display:none;">
+    <DIV id="SCHEMAS" class="column left"  style="top:75px; bottom:75px; left:5px; width:18%; overflow-x:hidden; overflow-y:auto; scrollbar-width:thin;">
+      <DIV class="tileHeader360g">
+         Entities <A href="javascript:TILDA_GLOBAL.addProject();"><IMG src="/static/img/add.gif"></A>
+                  <span class="searchBox"><input class="searchInput" type="text" name="" placeholder="Search"></span>
+      </DIV>
+      <DIV id="ENTITY_LIST"><IMG src="/static/img/progress.gif"></DIV>
+    </DIV>
+    <DIV id="EDITORS" class="column right"  style="top:75px; bottom:75px; left:20%; overflow-x:hidden; overflow-y:auto; scrollbar-width:thin;">
+      <DIV id="EDITOR"></DIV>
+    </DIV>
+  </MAIN>
 
   <FOOTER id="MAINCONTAINER_FOOTER">
     <TABLE WIDTH=100% style="font-size: 80%;">
@@ -58,9 +68,14 @@
 <script src="/static/dojo-release-1.16.4/dojo/dojo.js"></script>
 <SCRIPT type="module">
 import { projects } from "/static/js/module-projects.js";
-window.TILDA_GLOBAL = {};
-window.TILDA_GLOBAL.projects=projects;
-projects.paint("PROJECT_LIST");
+window.TILDA_GLOBAL = {
+  addProject: function()
+    {
+       projects.addProject("PROJECT_LIST");
+    }
+};
+projects.start("PROJECT_LIST");
+
 </SCRIPT>
 
 </body>

diff --git a/WebContent/static/css/tilda.css b/WebContent/static/css/tilda.css
@@ -62,7 +62,7 @@ A[target="_other"]::after {
   overflow: visible;
   line-height: 1;
 }
-#MAINCONTAINER_BODY {
+.mainContainerBody {
  flex: 1;
 }
 #MAINCONTAINER_FOOTER_POWERED IMG {
@@ -114,6 +114,15 @@ A[target="_other"]::after {
   }
 }
 
+.innerFlowedDiv {
+  position: absolute;
+  bottom: 0px; 
+  left: 0px; 
+  width: 100%; 
+  overflow: auto;
+  -webkit-overflow-scrolling: touch;
+  scrollbar-width: thin;
+}
 
 
 
@@ -1281,9 +1290,8 @@ select {
 }
 .formContainer {
    top: 0px;
-   bottom: 60px;
+   bottom: 2em;
    width: 99%;
-//   padding: 20px;
    margin-left: 1%;
    font-size: 100%;
 }
@@ -1658,6 +1666,7 @@ IMG.icon.single.badgeRed {
     background-color: rgba(0, 0, 0, 0.8);
     opacity: 0;
     transition: opacity 0.25s cubic-bezier(.55,.06,.68,.19);    
+    z-index: 10;
 }
 .modalDialog {
    position: absolute;
@@ -2010,10 +2019,11 @@ select {
 
 
 
-.formContainer {
-   bottom: 0;
-   font-size: 90%;
-}
+//.formContainer {
+//   bottom: 0;
+//   font-size: 90%;
+//}
+
 .formDiv {
    position: absolute;
    top: 15px;
@@ -2404,12 +2414,29 @@ table.centered {
   background-color: #FaFaFa;
   box-shadow: 0px 0px 2px #777;
 }
-.tile360g img {
+.tile360g IMG {
   width: 50px;
   height: 50px;
   float: left;
   padding-right: 20px;
 }
+.tile360g SPAN {
+    position:relative;
+}
+.tile360g SPAN[data-badge]::after {
+    content: attr(data-badge);
+    position: absolute;
+    top: 38px;
+    right: 35px;
+    font-size: 14px;
+    background: #5D93B7;
+    color: white;
+    width: 18px;
+    height: 18px;
+    text-align: center;
+    line-height: 18px;
+    border-radius: 15%;
+}
 .tile360g div:nth-child(2) {
   position: relative;
   color: #666;

diff --git a/WebContent/static/floria/module-ajax.js b/WebContent/static/floria/module-ajax.js
@@ -11,7 +11,7 @@ ajaxUrl: function(url, method, errorMsg, successFunc, errorFunc, postContents, t
      {
         if (method != 'POST')
          return FloriaDOM.alertThrow("Error: you cannot post data in a non POST ajax request");
-        url = url + "?" + FloriaDOM.isObject(postContents) == true ? FloriaDOM.makeUrlParams(postContents) : postContents;
+        url = url + "?" + (FloriaDOM.isObject(postContents) == true ? FloriaDOM.makeUrlParams(postContents) : postContents);
      }
 
 
@@ -39,7 +39,7 @@ ajaxUrl: function(url, method, errorMsg, successFunc, errorFunc, postContents, t
             alert("FYI THAT YOU CANCELED ANOTHER REQUEST!\n\nYou (or another user on the same account) was running a request you interrupted.");
 
           let data = xhr.response;
-          if (xhr.status != 200)
+          if (data?.code != 200 || xhr.status != 200)
            return xhr.onerror({code: data?.code||xhr.status, message : data?.msg||xhr.statusText, errors: data?.errors, type: data?.type });
           if (data == null)
             throw ("An error occurred: no data for " + FloriaDOM.truncateUrl(url));

diff --git a/WebContent/static/floria/module-dojosimple.js b/WebContent/static/floria/module-dojosimple.js
@@ -31,7 +31,7 @@ DojoSimple.HeaderBodyFooterLayout = function(MainId, initFunc)
           FloriaDOM.alertException(e);
         }
     });
-   require(["dojox/widget/Dialog","dojo/fx/easing"], function(Dialog, Easing) {});
+//   require(["dojox/widget/Dialog","dojo/fx/easing"], function(Dialog, Easing) {});
   }
 
 
@@ -69,7 +69,7 @@ DojoSimple.Dialog = function(elementId)
                          ;
       this._e.appendChild(this._md);
     }
-    
+
    var that = this;
    FloriaDOM.addEvent(elementId+"_MD_CLOSE", "click", function() {
      that.hide();

diff --git a/WebContent/static/floria/module-dom.js b/WebContent/static/floria/module-dom.js
@@ -210,6 +210,11 @@ export var FloriaDOM = {
         if (e != null)
           e.style.display=e.style.display=="" ? "none" : "";
       },
+    switchVisibility: function(divId1, divId2, str)
+     {
+       FloriaDOM.showHide(divId1, str);
+       FloriaDOM.showHide(divId2, str);
+     },
     parentWidth: function(e, Str)
       {
         return FloriaDOM.getElement(e, Str).parentNode.offsetWidth;

diff --git a/WebContent/static/floria/module-forms2.js b/WebContent/static/floria/module-forms2.js
@@ -36,7 +36,7 @@ function createNavEvents(form)
    if (form._customNav == true)
     return;
 
-   if (form._popupTitle==null)
+   if (form._popupTitle==null || form._submitButton == true)
     FloriaDOM.addEvent(form._elementId+'_F_SUBMIT', "click", function() { form.updatePage(null); });
 
    if (form._cancelButton == true)
@@ -263,7 +263,7 @@ function fillGroup(d, elementId, pageId, rowId, descriptions, data, widgets, pic
  };
 
 
-export var FloriaForms = function(elementId, data, formDefs, edgeColumnCount, processCallbackFunc, popupTitle, wizardMode, liveOnChange, persist, validationErrMsg, cancelButton)
+export var FloriaForms = function(elementId, data, formDefs, edgeColumnCount, processCallbackFunc, popupTitle, wizardMode, liveOnChange, persist, validationErrMsg, cancelButton, submitButton)
  { 
 //   console.log("=>=>=> Forms2.constructor (data): ", data);
    formDefs = FloriaDOM.clone(formDefs);
@@ -349,12 +349,13 @@ export var FloriaForms = function(elementId, data, formDefs, edgeColumnCount, pr
    this._popupTitle = popupTitle;
    this._liveOnChange = liveOnChange;
    this._cancelButton = cancelButton;
+   this._submitButton = submitButton;
    this._pickersLoading = 0;
    if (popupTitle != null)
     {
       this._dlg = new DojoSimple.Dialog(elementId+"_DLG");
       var that = this;
-      this._dlg.setOnHide(function() { that.updatePage(null, null, true); });
+      this._dlg.setOnHide(function() { if (that._cancelButton != true) that.updatePage(null, null, true); });
     }
 
    this.setCollapser = function(collapserClassName, collapseHTML, collapseTitle, expandHTML, expandTitle)
@@ -449,13 +450,13 @@ export var FloriaForms = function(elementId, data, formDefs, edgeColumnCount, pr
     }
 
 
-   this.setContentOrShowDialog = function(pageId, frameContentCallbackFunc, Str, isCreateNavEvents)
+   this.setContentOrShowDialog = function(pageId, frameContentCallbackFunc, Str, isCreateNavEvents, widthPct, heightPct)
    {
      var that = this;
      if (this._popupTitle != null)
        {
 
-         this._dlg.show(this._popupTitle, null, 0.9, 0.9, function(cntId) { 
+         this._dlg.show(this._popupTitle, null, widthPct||0.9, heightPct||0.9, function(cntId) { 
            FloriaDOM.setInnerHTML(cntId ,Str);
            if (isCreateNavEvents == true)
              createNavEvents(that);
@@ -474,6 +475,12 @@ export var FloriaForms = function(elementId, data, formDefs, edgeColumnCount, pr
        }
    }
 
+   this.closeDialog = function()
+    {
+      if (this._dlg != null)
+       this._dlg.hide();
+    }
+
    this.getWizardModeMarkup = function(pageId)
    {
      var Str = "";
@@ -496,7 +503,7 @@ export var FloriaForms = function(elementId, data, formDefs, edgeColumnCount, pr
            Str+= '<DIV class="formNavFooter">'
                    +'<CENTER><BUTTON class="formButton" id="'+this._elementId+'_F_PREV">Previous</BUTTON>'
                            +'&nbsp;&nbsp;&nbsp;&nbsp;<BUTTON class="formButton" id="'+this._elementId+'_F_NEXT">Next</BUTTON>'
-                           +(this._popupTitle   == null?'&nbsp;&nbsp;&nbsp;&nbsp;<BUTTON class="formButton" id="'+this._elementId+'_F_SUBMIT" style="display:none;" data-forms2="1">Submit</BUTTON>':'')
+                           +(this._popupTitle   == null || this._submitButton == true?'&nbsp;&nbsp;&nbsp;&nbsp;<BUTTON class="formButton" id="'+this._elementId+'_F_SUBMIT" style="display:none;" data-forms2="1">Submit</BUTTON>':'')
                            +(this._cancelButton == true?'&nbsp;&nbsp;&nbsp;&nbsp;<BUTTON class="formButton" id="'+this._elementId+'_F_CANCEL">Cancel</BUTTON>':'')
                    +'</CENTER>'
                  +'</DIV>'
@@ -519,12 +526,14 @@ export var FloriaForms = function(elementId, data, formDefs, edgeColumnCount, pr
          {
            Str+='<DIV class="formNavFooter">'
                 +'<CENTER>'
-                  +(this._popupTitle==null?'<BUTTON class="formButton" id="'+this._elementId+'_F_SUBMIT" data-forms2="1">Submit</BUTTON>'
-                                          +(this._cancelButton == true?'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<BUTTON class="formButton" id="'+this._elementId+'_F_CANCEL">Cancel</BUTTON>'
-                                                                      :''
-                                           )
-                                          :''
-                    )
+                  +(this._popupTitle==null || this._submitButton == true
+                      ?'<BUTTON class="formButton" id="'+this._elementId+'_F_SUBMIT" data-forms2="1">Submit</BUTTON>'
+                      :''
+                   )
+                  +(this._cancelButton == true
+                      ?'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<BUTTON class="formButton" id="'+this._elementId+'_F_CANCEL">Cancel</BUTTON>'
+                      :''
+                   )
                 +'</CENTER>'
               +'</DIV>'
               ;
@@ -537,7 +546,7 @@ export var FloriaForms = function(elementId, data, formDefs, edgeColumnCount, pr
      return Str;
    }
 
-   this.paint = function(pageId, frameContentOverride, frameContentCallbackFunc)
+   this.paint = function(pageId, frameContentOverride, frameContentCallbackFunc, widthPct, heightPct)
     {
       if(this._widgets != null) 
         for (var i = 0; i < this._widgets.length; ++i)
@@ -553,13 +562,13 @@ export var FloriaForms = function(elementId, data, formDefs, edgeColumnCount, pr
       if (this._wizardMode == true)
        {
          var Str = this.getWizardModeMarkup(pageId);
-         var exit = this.setContentOrShowDialog(pageId, frameContentCallbackFunc, Str, true)
+         var exit = this.setContentOrShowDialog(pageId, frameContentCallbackFunc, Str, true, widthPct, heightPct)
          if(exit == true)
            return;
        }
       else if (frameContentOverride != null)
        {
-         var exit = this.setContentOrShowDialog(pageId, frameContentCallbackFunc, frameContentOverride, false);
+         var exit = this.setContentOrShowDialog(pageId, frameContentCallbackFunc, frameContentOverride, false, widthPct, heightPct);
          if (exit == true)
            return;
        }

diff --git a/WebContent/static/img/folder-blue-empty.70x70.png b/WebContent/static/img/folder-blue-empty.70x70.png
diff --git a/WebContent/static/img/folder-blue-full.70x70.png b/WebContent/static/img/folder-blue-full.70x70.png