zet-lib 3.0.8 → 3.0.9

package/lib/generatorModel.js

@@ -453,6 +453,10 @@ me.prepare = (MYMODEL) => {
                 widgets[key].code = property.values.code || "";
                 break;
 
+            case "money":
+                widgets[key].symbol = property.values.symbol || "";
+                break;
+
             default:
                 break;
         }
@@ -563,16 +567,12 @@ me.build_sql_api = (columns, constraintList, MYMODEL) => {
             }
         }
     }
-
-    //var constraintList = await connection.query(connection.constraintList(MYMODEL.table));
-    //make a object instead of array
     const constraintObject = Util.arrayToObject(constraintList, "conname");
-
     const alter = [];
     const index = [];
     const defaultValue = [];
     const fk = [];
-    const notAlters = ["virtual", "custom"];
+    const notAlters = ["virtual", "custom","html"];
     for (const key in properties) {
         const property = properties[key];
         if (!notAlters.includes(property.type)) {
@@ -602,6 +602,14 @@ me.build_sql_api = (columns, constraintList, MYMODEL) => {
                     index.push(`DROP INDEX ${idx}; `);
                 }
             }
+            if(property.type == "money"){
+                //ALTER TABLE nama_tabel
+                // ALTER COLUMN nama_kolom TYPE NUMERIC(15,2);
+                let digitDecimal = properties[key].values.digitDecimal || 0;
+                alter.push(
+                    `ALTER TABLE "${MYMODEL.table}" ALTER COLUMN "${key}" TYPE NUMERIC(15,${digitDecimal});; `
+                );
+            }
             //relations foreign key
             const fkx = `fk_${MYMODEL.table}_${key}`;
             if (sqlObject.foreignKey) {

package/lib/moduleLib.js

@@ -53,9 +53,9 @@ m.datepicker = function (req, res, elem) {
   /*  head += '<link href="/css/bootstrap-datepicker.css" rel="stylesheet">';
       end += '<script src="/js/bootstrap-datepicker.min.js"></script>';*/
   head +=
-    '<link href="/modules/bootstrap-datepicker/bootstrap-datepicker.min.css" rel="stylesheet">';
+      '<link href="/modules/bootstrap-datepicker/bootstrap-datepicker.min.css" rel="stylesheet">';
   end +=
-    '<script src="/modules/bootstrap-datepicker/bootstrap-datepicker.min.js"></script>';
+      '<script src="/modules/bootstrap-datepicker/bootstrap-datepicker.min.js"></script>';
   script = `$.fn.datepicker.defaults.format = "yyyy-mm-dd";$.fn.datepicker.defaults.todayHighlight = true;$("body").on("click", "${elem}", function(){$(this).datepicker();$(this).datepicker("show");});`;
 
   return {
@@ -74,7 +74,7 @@ m.selectize = function (req, res, elem) {
   let end = ``;
   elem = elem || ".selectize";
   head +=
-    '<link href="/modules/selectizejs/css/selectize.bootstrap5.css" rel="stylesheet">';
+      '<link href="/modules/selectizejs/css/selectize.bootstrap5.css" rel="stylesheet">';
   end += '<script src="/modules/selectizejs/js/selectize.min.js"></script>';
 
   script += `$(() => {
@@ -339,11 +339,11 @@ m.datetimepicker = function (req, res, elem) {
   let end = ``;
   elem = elem || ".datetimepicker";
   head +=
-    '<link href="/css/bootstrap-datetimepicker.min.css" rel="stylesheet" />';
+      '<link href="/css/bootstrap-datetimepicker.min.css" rel="stylesheet" />';
   end +=
-    '<script type="text/javascript" src="/js/moment-with-locales.min.js" ></script>';
+      '<script type="text/javascript" src="/js/moment-with-locales.min.js" ></script>';
   end +=
-    '<script type="text/javascript" src="/js/bootstrap-datetimepicker.min.js" ></script>';
+      '<script type="text/javascript" src="/js/bootstrap-datetimepicker.min.js" ></script>';
   script += `$(function () { $("${elem}").datetimepicker({format:'YYYY-MM-DD hh:mm:ss'}); });`;
   script += `setTimeout(function () { $("body").click();},1000);`;
   script += `$("body").on("click", function(){$("${elem}").datetimepicker({format:'YYYY-MM-DD hh:mm:ss'});});`;
@@ -362,14 +362,14 @@ m.ckeditor = function (req, res, elem) {
   let end = ``;
   elem = elem || ".editor";
   end +=
-    '<script src="/modules/ckeditor5-build-classic/ckeditor.js"></script>' +
-    newLine;
+      '<script src="/modules/ckeditor5-build-classic/ckeditor.js"></script>' +
+      newLine;
   end += "<script>";
   end +=
-    'ClassicEditor.create( document.querySelector( "' +
-    elem +
-    '" ) ).catch( error => {console.error( error );} );' +
-    newLine;
+      'ClassicEditor.create( document.querySelector( "' +
+      elem +
+      '" ) ).catch( error => {console.error( error );} );' +
+      newLine;
   end += "</script>";
   return {
     head: head,
@@ -385,8 +385,8 @@ m.tinymce = function (req, res, elem) {
   let end = ``;
   elem = elem || ".tinymce";
   end +=
-    '<script src="https://cdn.tiny.cloud/1/b7054u42l8lw67ch5oh9qutnvbyu8exzryg4edy0gg2snhtr/tinymce/6/tinymce.min.js" referrerpolicy="origin"></script>' +
-    newLine;
+      '<script src="https://cdn.tiny.cloud/1/b7054u42l8lw67ch5oh9qutnvbyu8exzryg4edy0gg2snhtr/tinymce/6/tinymce.min.js" referrerpolicy="origin"></script>' +
+      newLine;
   script += ` tinymce.init({
       selector: '${elem}',
       plugins: 'anchor autolink charmap codesample emoticons image link lists media searchreplace table visualblocks wordcount',
@@ -407,11 +407,11 @@ m.froala = function (req, res, elem) {
   elem = elem || ".editor";
 
   head +=
-    '<link href="https://cdn.jsdelivr.net/npm/froala-editor@2.9.0/css/froala_editor.pkgd.min.css" rel="stylesheet" type="text/css" />';
+      '<link href="https://cdn.jsdelivr.net/npm/froala-editor@2.9.0/css/froala_editor.pkgd.min.css" rel="stylesheet" type="text/css" />';
   head +=
-    '<link href="https://cdn.jsdelivr.net/npm/froala-editor@2.9.0/css/froala_style.min.css" rel="stylesheet" type="text/css" />';
+      '<link href="https://cdn.jsdelivr.net/npm/froala-editor@2.9.0/css/froala_style.min.css" rel="stylesheet" type="text/css" />';
   end +=
-    '<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/froala-editor@2.9.0/js/froala_editor.pkgd.min.js"></script>';
+      '<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/froala-editor@2.9.0/js/froala_editor.pkgd.min.js"></script>';
   script += `$(function() {$("${elem}").froalaEditor({height: 200})});`;
 
   return {
@@ -449,13 +449,13 @@ m.editor = (req, res, elem = "") => {
   let end = ``;
 
   head +=
-    '<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.4.2/css/all.min.css" integrity="sha512-NicFTMUg/LwBeG8C7VG+gC4YiiRtQACl98QdkmfsLy37RzXdkaUAuPyVMND0olPP4Jn8M/ctesGSB2pgUBDRIw==" crossorigin="anonymous" referrerpolicy="no-referrer" />';
+      '<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.4.2/css/all.min.css" integrity="sha512-NicFTMUg/LwBeG8C7VG+gC4YiiRtQACl98QdkmfsLy37RzXdkaUAuPyVMND0olPP4Jn8M/ctesGSB2pgUBDRIw==" crossorigin="anonymous" referrerpolicy="no-referrer" />';
   head +=
-    '<link href="https://cdn.jsdelivr.net/npm/froala-editor@2.9.0/css/froala_editor.pkgd.min.css" rel="stylesheet" type="text/css" />';
+      '<link href="https://cdn.jsdelivr.net/npm/froala-editor@2.9.0/css/froala_editor.pkgd.min.css" rel="stylesheet" type="text/css" />';
   head +=
-    '<link href="https://cdn.jsdelivr.net/npm/froala-editor@2.9.0/css/froala_style.min.css" rel="stylesheet" type="text/css" />';
+      '<link href="https://cdn.jsdelivr.net/npm/froala-editor@2.9.0/css/froala_style.min.css" rel="stylesheet" type="text/css" />';
   end +=
-    '<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/froala-editor@2.9.0/js/froala_editor.pkgd.min.js"></script>';
+      '<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/froala-editor@2.9.0/js/froala_editor.pkgd.min.js"></script>';
   script += `$(function() {$("${elem}").froalaEditor({height: 200})});`;
 
   return {
@@ -472,11 +472,11 @@ m.switch = function (req, res, elem, array) {
   let end = ``;
 
   head +=
-    '<link href="/modules/bootstrap-switch/bootstrap-switch.css" rel="stylesheet" type="text/css" />' +
-    newLine;
+      '<link href="/modules/bootstrap-switch/bootstrap-switch.css" rel="stylesheet" type="text/css" />' +
+      newLine;
   end +=
-    '<script type="text/javascript" src="/modules/bootstrap-switch/bootstrap-switch.js"></script>' +
-    newLine;
+      '<script type="text/javascript" src="/modules/bootstrap-switch/bootstrap-switch.js"></script>' +
+      newLine;
 
   let labels = "";
   if (Array.isArray(array)) {
@@ -496,11 +496,11 @@ m.switchOld = function (req, res, elem, array) {
   let end = ``;
   elem = elem || ".switch";
   head +=
-    '<link href="https://cdn.jsdelivr.net/gh/gitbrent/bootstrap4-toggle@3.6.1/css/bootstrap4-toggle.min.css" rel="stylesheet">' +
-    newLine;
+      '<link href="https://cdn.jsdelivr.net/gh/gitbrent/bootstrap4-toggle@3.6.1/css/bootstrap4-toggle.min.css" rel="stylesheet">' +
+      newLine;
   end +=
-    '<script src="https://cdn.jsdelivr.net/gh/gitbrent/bootstrap4-toggle@3.6.1/js/bootstrap4-toggle.min.js"></script>' +
-    newLine;
+      '<script src="https://cdn.jsdelivr.net/gh/gitbrent/bootstrap4-toggle@3.6.1/js/bootstrap4-toggle.min.js"></script>' +
+      newLine;
 
   let labels = "";
   if (Array.isArray(array)) {
@@ -521,11 +521,11 @@ m.clockpicker = function (req, res, elem) {
   let end = ``;
   elem = elem || ".clockpicker";
   head +=
-    '<link href="/modules/jquery-clockpicker.min.css" rel="stylesheet" type="text/css" />' +
-    newLine;
+      '<link href="/modules/jquery-clockpicker.min.css" rel="stylesheet" type="text/css" />' +
+      newLine;
   end +=
-    '<script type="text/javascript" src="/modules/bootstrap-clockpicker.min.js"></script>' +
-    newLine;
+      '<script type="text/javascript" src="/modules/bootstrap-clockpicker.min.js"></script>' +
+      newLine;
   script += `$("body").on("click", "${elem}", function(){$(this).clockpicker({donetext: "Done"});});`;
   //end += '$("' + elem + '").clockpicker({donetext: "Done"});' + newLine;
   return {
@@ -542,7 +542,7 @@ m.number = (req, res, elem) => {
   elem = elem || ".number";
 
   end +=
-    '<script type="text/javascript" src="/js/jquery-currency.js"></script>';
+      '<script type="text/javascript" src="/js/jquery-currency.js"></script>';
   script += `$(function () { $(".number").formatCurrencyLive({symbol:"",roundToDecimalPlace :0,digitGroupSymbol :"."}); });`;
   script += `setTimeout(function () { $("body").click();},1000);`;
   script += `$("body").on("click", function(){$(".number").formatCurrencyLive({symbol:"",roundToDecimalPlace :0,digitGroupSymbol :"."});});`;
@@ -560,8 +560,8 @@ m.typeahead = (req, res, table, elem) => {
   let end = ``;
   elem = elem || ".typeahead";
   end +=
-    '<script type="text/javascript" src="/modules/typeahead/typeahead.js"></script>' +
-    newLine;
+      '<script type="text/javascript" src="/modules/typeahead/typeahead.js"></script>' +
+      newLine;
 
   let elemData = elem.replace(".", "").replace("#", "");
   let element = elem.replace("Typeahead", "");
@@ -607,8 +607,8 @@ m.typeaheadFile = (req, res, elem, data) => {
   data = data || [];
   elem = elem || ".typeahead";
   end +=
-    '<script type="text/javascript" src="/modules/typeahead/typeahead.js"></script>' +
-    newLine;
+      '<script type="text/javascript" src="/modules/typeahead/typeahead.js"></script>' +
+      newLine;
 
   let elemData = elem.replace(".", "");
   elemData = elemData.replace("#", "");
@@ -661,7 +661,7 @@ m.dropboxview = (req, res) => {
   let head = ``;
   let end = ``;
   script +=
-    `let dropbox_image = {}
+      `let dropbox_image = {}
     $(()=>{
    $(".zdropbox-view").each(function (index, item) {
        let dropboxLength = $(".zdropbox-view").length || 0;
@@ -729,9 +729,9 @@ m.addScript = (req, res, contentScript, at = "end", type = "script") => {
   if (contentScript) {
     let generateId = "app_" + Util.generate(6);
     let tagOpen =
-      type == "script"
-        ? `<script  id="${generateId}">`
-        : '<style type="text/css">';
+        type == "script"
+            ? `<script  id="${generateId}">`
+            : '<style type="text/css">';
     let tagClose = type == "script" ? "</script>" : "</style>";
     let content = at == "end" ? res.locals.moduleEnd : res.locals.moduleHead;
     content += tagOpen + newLine;
@@ -746,8 +746,8 @@ m.addScript = (req, res, contentScript, at = "end", type = "script") => {
 
 m.addModule = (req, res, content, isModuleHead = false) => {
   let moduleContent = isModuleHead
-    ? res.locals.moduleHead
-    : res.locals.moduleEnd;
+      ? res.locals.moduleHead
+      : res.locals.moduleEnd;
   moduleContent += content;
   if (isModuleHead) {
     res.locals.moduleHead = moduleContent;
@@ -762,8 +762,8 @@ m.highchart = async (req, res, obj) => {
   let end = res.locals.moduleEnd;
   if (end.indexOf("highcharts") < 0) {
     end +=
-      '<script src="https://code.highcharts.com/highcharts.js"></script>' +
-      newLine;
+        '<script src="https://code.highcharts.com/highcharts.js"></script>' +
+        newLine;
   }
 
   if (!Util.isEmptyObject(obj)) {
@@ -821,16 +821,16 @@ m.highlight = (req, res, elem) => {
   let end = res.locals.moduleEnd;
   if (head.indexOf("highlight") < 0) {
     head +=
-      '<link rel="stylesheet" href="/modules/highlight/default.min.css"> ' +
-      newLine;
+        '<link rel="stylesheet" href="/modules/highlight/default.min.css"> ' +
+        newLine;
     end +=
-      '<script src="/modules/highlight/highlight.min.js"></script>' + newLine;
+        '<script src="/modules/highlight/highlight.min.js"></script>' + newLine;
   }
   end +=
-    '<script>$(function(){ document.querySelectorAll("' +
-    elem +
-    '").forEach((block) => {hljs.highlightBlock(block);}); })</script>' +
-    newLine;
+      '<script>$(function(){ document.querySelectorAll("' +
+      elem +
+      '").forEach((block) => {hljs.highlightBlock(block);}); })</script>' +
+      newLine;
   res.locals.moduleHead = head;
   res.locals.moduleEnd = end;
 };
@@ -842,11 +842,11 @@ m.selectpicker = function (req, res, elem) {
   let end = res.locals.moduleEnd;
   if (head.indexOf("bootstrap-select") < 0) {
     head +=
-      '<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.14/dist/css/bootstrap-select.min.css">' +
-      newLine;
+        '<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.14/dist/css/bootstrap-select.min.css">' +
+        newLine;
     end +=
-      '<script src="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.14/dist/js/bootstrap-select.min.js"></script>' +
-      newLine;
+        '<script src="https://cdn.jsdelivr.net/npm/bootstrap-select@1.13.14/dist/js/bootstrap-select.min.js"></script>' +
+        newLine;
     end += `<script>$(function () {$('${elem}').selectpicker();});</script>${newLine}`;
   }
   res.locals.moduleHead = head;

package/lib/views/generatorjs.ejs

@@ -139,8 +139,8 @@
                     dropdownRelations('dropdown_multi_table', 'dropdown_multi_name', '', $('#dropdown_multi_table').data('value'), $('#dropdown_multi_name').data('value'))
                 }
 
-                $("#number_decimalPlaces").css("font-size","2rem");
-                $("#number_thousandSeparator").css("font-size","2rem");
+                $("#money_decimalPlaces").css("font-size","2rem");
+                $("#money_thousandSeparator").css("font-size","2rem");
             }
         )
         $('#modal_setting').modal('show')