biz9-logic 4.8.350 → 4.8.353

package/biz9_config

@@ -1,4 +1,4 @@
-VERSION='8.3.0'
+VERSION='8.3.3'
 TITLE='BiZ9-Logic';
 REPO='git@github.com:biz9framework/biz9-logic.git';
 BRANCH='main';

package/index.js

@@ -265,7 +265,14 @@ class Type {
 	static RESIZE_SQUARE="squre";
 	static RESIZE_NONE="none";
 
-	static get_title = (type,plural)=>{
+	static get_title = (type,option)=>{
+		/* option
+		 * get_lowercase = ex. true,false / def. false
+		 * get_plural = ex. true,false /  def. false
+		 * get_url = ex. true,false /  def. false
+		*/
+		let r_type = "";
+		option = option ? option : {get_lowercase:false,get_plural:false,get_url:false};
 		switch(type){
 			case Type.STAT_VIEW:
 				return "View";
@@ -306,13 +313,67 @@ class Type {
 			case Type.PAGE_PRODUCT_DETAIL:
 			case Type.PAGE_SERVICE:
 			case Type.PAGE_SERVICE_DETAIL:
-				return String(Str.get_title(type.replaceAll('_',' '))).trim();
-				break;
-
+			case Type.USER_ROLE_SUPER_ADMIN:
+			case Type.USER_ROLE_ADMIN:
+			case Type.USER_ROLE_MANAGER:
+			case Type.USER_ROLE_USER:
+			case Type.USER_ROLE_GUEST:
+			case DataType.SECTION:
+			case DataType.SUB_SECTION:
+			case DataType.APP:
+			case DataType.BLANK:
+			case DataType.BLOG_POST:
+			case DataType.CART_ITEM:
+			case DataType.CATEGORY:
+			case DataType.CUSTOM_FIELD:
+			case DataType.CONTENT:
+			case DataType.EVENT:
+			case DataType.FAQ:
+			case DataType.FAVORITE:
+			case DataType.GALLERY:
+			case DataType.ITEM_MAP:
+			case DataType.ITEM:
+			case DataType.CART:
+			case DataType.CART_ITEM:
+			case DataType.CART_SUB_ITEM:
+			case DataType.ORDER:
+			case DataType.ORDER_ITEM:
+			case DataType.ORDER_SUB_ITEM:
+			case DataType.ORDER_PAYMENT:
+			case DataType.PRODUCT:
+			case DataType.IMAGE:
+			case DataType.PAGE:
+			case DataType.REVIEW:
+			case DataType.SERVICE:
+			case DataType.SECURITY:
+			case DataType.STAT:
+			case DataType.TEMPLATE:
+			case DataType.USER:
+			case DataType.VIDEO:
+			r_type = String(Str.get_title(type.replaceAll('_',' ').replaceAll('dt','').replace('biz',''))).trim();
+				console.log(r_type);
+				console.log('11111111');
+			break;
 			default:
-				return "N/A";
+				r_type = "N/A";
 				break;
 		}
+			console.log(type);
+			console.log('aaaaa');
+			console.log(r_type);
+			if(option.get_plural){
+				console.log('bbbbbbbb');
+				r_type = r_type + 's';
+			}
+			if(option.get_lowercase){
+				console.log('cccccccc');
+				r_type = r_type.toLowerCase();
+			}
+			if(option.get_url){
+				console.log('dddddddd');
+				r_type = r_type.replace(" ","_").toLowerCase();
+			}
+			return r_type;
 	}
 }
 class Stat_Logic {
@@ -1091,68 +1152,14 @@ class DataType {
 	static TEMPLATE='template_biz';
 	static USER='user_biz';
 	static VIDEO='video_biz';
-
-	static get_title = (data_type,get_plural) => {
-		let r_data_type =  (!data_type) ? "" : String(Str.get_title(data_type.replaceAll('_',' ').replaceAll('dt','').replace('biz',''))).trim();
-		if(get_plural){
-			if(data_type==DataType.GALLERY){
-				return 'Galleries';
-			}else{
-				return r_data_type + "s";
-			}
-		}else{
-			return r_data_type;
-		}
-
-	}
-	static get_url(data_type){
-		switch(data_type){
-			case DataType.BLOG_POST:
-				return 'blog_post';
-			case DataType.SERVICE:
-				return 'service';
-			case DataType.EVENT:
-				return 'event';
-			case DataType.GALLERY:
-				return 'gallery';
-			case DataType.PRODUCT:
-				return 'product';
-			case DataType.BLANK:
-				return 'blank';
-			case DataType.REVIEW:
-				return 'review';
-			case DataType.FAQ:
-				return 'faq';
-			case DataType.FAVORITE:
-				return 'favorite';
-			case DataType.CATEGORY:
-				return 'category';
-			case DataType.VIDEO:
-				return 'video';
-			case DataType.IMAGE:
-				return 'image';
-			case DataType.PAGE:
-				return 'page';
-			case DataType.USER:
-				return 'user';
-			case DataType.TEMPLATE:
-				return 'template';
-			case DataType.CONTENT:
-				return 'content';
-			case DataType.ITEM:
-				return 'item';
-			case DataType.CUSTOM_FIELD:
-				return 'custom_field';
-		}
-	}
 	static get_list = () =>{
 		return [
-			{	title:DataType.get_title(DataType.BLOG_POST),type:DataType.BLOG_POST},
-			{	title:DataType.get_title(DataType.EVENT),type:DataType.EVENT},
-			{	title:DataType.get_title(DataType.GALLERY),type:DataType.GALLERY},
-			{	title:DataType.get_title(DataType.USER),type:DataType.USER},
-			{	title:DataType.get_title(DataType.PRODUCT),type:DataType.PRODUCT},
-			{	title:DataType.get_title(DataType.SERVICE),type:DataType.SERVICE}
+			{	title:Type.get_title(DataType.BLOG_POST),type:DataType.BLOG_POST},
+			{	title:Type.get_title(DataType.EVENT),type:DataType.EVENT},
+			{	title:Type.get_title(DataType.GALLERY),type:DataType.GALLERY},
+			{	title:Type.get_title(DataType.USER),type:DataType.USER},
+			{	title:Type.get_title(DataType.PRODUCT),type:DataType.PRODUCT},
+			{	title:Type.get_title(DataType.SERVICE),type:DataType.SERVICE}
 		]
 	};
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "biz9-logic",
-  "version": "4.8.350",
+  "version": "4.8.353",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/test.js

@@ -1,6 +1,5 @@
 const series = require('async-series');
-const {DataItem,DataType,Page_Logic} = require('./index');
-
+const {DataItem,DataType,Page_Logic,Type} = require('./index');
 const {Log,Num} = require('biz9-utility');
 const {Scriptz}= require('biz9-scriptz');
 
@@ -31,12 +30,7 @@ describe("connect", () => {
         series([
             function(call) {
                 console.log('CONNECT-START');
-                console.log();
-                let my_list = Page_Logic.get_page_list()
-                my_list.forEach(item => {
-                    console.log(item);
-                });
-
+                console.log(Type.get_title(Type.STAT_VIEW,{get_plural:false,get_lowercase:true,get_url:true}));
                 console.log('CONNECT-END');
                 call();
             },