biz9-logic 4.8.27 → 4.8.32

package/biz9_config

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

package/index.js

@@ -128,7 +128,7 @@ class Page_Logic {
 		option = Field_Logic.get_option(DataType.PAGE,option?option:{});
 		let item_list = [];
 		for(let a=0;a<option.page_count;a++){
-			item_list.push(Page_Logic.get_test("Page " +parseInt(a+1),option));
+			item_list.push(Page_Logic.get_test( "Page " +parseInt(a+1)? !option.get_blank : "",option));
 		}
 		return item_list;
 	}
@@ -342,19 +342,27 @@ class Event_Logic {
 }
 class Field_Logic {
 	static get_test = (title,option) =>{
+		let sub_note = "Sub Note "+String(Number.get_id());
+		let note = "Note "+String(Number.get_id());
 		if(!option){
 			option= {};
 		}
 		if(!option.category_title){
 			option.category_title = 'Category '+String(Number.get_id());
 		}
+		if(option.get_blank == true){
+			title = "";
+			sub_note = "";
+			note  = "";
+			option.category_title = "";
+		}
 		let item = {
 			title:title,
 			setting_visible:"1",
 			title_url:Str.get_title_url(title),
 			category:option.category_title,
-			sub_note:"Sub Note "+String(Number.get_id()),
-			note:"Note "+String(Number.get_id())
+			sub_note:sub_note,
+			note:note
 		}
 		if(option.get_value){
 			item = Field_Logic.get_value_list(item,option);
@@ -363,12 +371,41 @@ class Field_Logic {
 	}
 	static get_value_list(item,option){
 		for(let b=0;b<option.value_count;b++){
-			item['value_'+String(b+1)] = 'value ' + String(b+1);
-			item['field_'+String(b+1)] = Str.get_title_url(item['value_'+String(b+1)]);
-			item[Str.get_title_url('value ' + String(b+1))] = item.title + ' value ' + String(b+1);
+			if(option.get_blank == false){
+				item['value_'+String(b+1)] = 'value ' + String(b+1);
+				item['field_'+String(b+1)] = Str.get_title_url(item['value_'+String(b+1)]);
+				item[Str.get_title_url('value ' + String(b+1))] = item.title + ' value ' + String(b+1);
+			}else{
+				item['value_'+String(b+1)] = "";
+				item['field_'+String(b+1)] = "";
+				item[Str.get_title_url('value ' + String(b+1))] ="";
+			}
 		}
 		return item;
 	};
+	static get_option_admin(req){
+    	let option = {};
+		option.category_product_count = req.query.category_product_count?parseInt(req.query.category_product_count): 9;
+    option.product_count = req.query.product_count?parseInt(req.query.product_count): 19;
+    option.category_blog_post_count = req.query.category_blog_post_count?parseInt(req.query.category_blog_post_count): 9;
+    option.blog_post_count = req.query.blog_post_count?parseInt(req.query.blog_post_count): 19;
+    option.category_service_count = req.query.category_service_count?parseInt(req.query.category_service_count): 9;
+    option.service_count = req.query.service_count?parseInt(req.query.service_count): 19;
+    option.category_event_count = req.query.category_event_count?parseInt(req.query.category_event_count): 9;
+    option.event_count = req.query.event_count?parseInt(req.query.event_count): 19;
+
+    option.get_admin = req.query.get_admin?String(req.query.get_admin)=='true': false;
+    option.get_business = req.query.get_business?String(req.query.get_business)=='true': false;
+    option.get_blog_post = req.query.get_blog_post?String(req.query.get_blog_post)=='true': false;
+    option.get_event = req.query.get_event?String(req.query.get_event)=='true': false;
+    option.get_faq = req.query.get_faq?String(req.query.get_faq)=='true': false;
+    option.get_template = req.query.get_template?String(req.query.get_template)=='true': false;
+    option.get_page = req.query.get_page?String(req.query.get_page)=='true': false;
+    option.get_product = req.query.get_product?String(req.query.get_product)=='true': false;
+    option.get_service = req.query.get_service?String(req.query.get_service)=='true': false;
+    option.get_team = req.query.get_team?String(req.query.get_team)=='true': false;
+		return option;
+	}
 	static get_option(data_type,option){
 		if(!data_type){
 			data_type = DataType.BLANK;
@@ -400,6 +437,9 @@ class Field_Logic {
 		if(!option.category_title){
 			option.category_title=null;
 		}
+		if(!option.get_blank){
+			option.get_blank=false;
+		}
 		if(option.data_type==DataType.PAGE){
 			if(!option.page_count){
 				option.page_count=9;
@@ -489,16 +529,54 @@ class Social {
 	static LINKEDIN_URL="https://linkedin.com/";
 }
 class PageType {
+	static get_title = (data_type) => {
+		if(!data_type){
+			return "";
+		}else{
+			return String(Str.get_title(data_type.replaceAll('_',' '))).trim();
+		}
+	}
+	static get_item_list = () =>{
+		return [
+			{title:DataType.get_title(PageType.ABOUT),type:DataType.ABOUT},
+			{title:DataType.get_title(PageType.BLOG_POST),type:DataType.BLOG_POST},
+			{title:DataType.get_title(PageType.CONTACT),type:DataType.CONTACT},
+			{title:DataType.get_title(PageType.EVENT),type:DataType.EVENT},
+			{title:DataType.get_title(PageType.GALLERY),type:DataType.GALLERY},
+			{title:DataType.get_title(PageType.HOME),type:DataType.HOME},
+			{title:DataType.get_title(PageType.TEAM),type:DataType.TEAM},
+			{title:DataType.get_title(PageType.PRODUCT),type:DataType.PRODUCT},
+			{title:DataType.get_title(PageType.SERVICE),type:DataType.SERVICE}
+		]
+	};
 	static HOME='home';
 	static ABOUT='about';
 	static CONTACT='contact';
+
 	static BLOG_POST='blog_post';
-	static GALLERY='gallery';
+	static BLOG_POST_BROWSE='blog_post_browse';
+	static BLOG_POST_DETAIL='blog_post_detail';
+
 	static EVENT='event';
+	static EVENT_BROWSE='event_browse';
+	static EVENT_DETAIL='event_detail';
+
+	static GALLERY='gallery';
+	static GALLERY_BROWSE='gallery_browse';
+	static GALLERY_DETAIL='gallery_detail';
+
 	static SERVICE='service';
+	static SERVICE_BROWSE='service_browse';
+	static SERVICE_DETAIL='service_detail';
+
 	static PRODUCT='product';
+	static PRODUCT_BROWSE='product_browse';
+	static PRODUCT_DETAIL='product_detail';
+
 	static PROJECT='project';
-	static TEAM='team';
+	static PROJECT_BROWSE='project_browse';
+	static PROJECT_DETAIL='project_detail';
+
 	static SECTION_1='section_1';
 	static SECTION_2='section_2';
 	static SECTION_3='section_2';
@@ -916,6 +994,10 @@ class Page_Url {
 		let action_url="page/get/"+title_url;
 		return get_cloud_url_main(biz9_config.APP_ID,biz9_config.URL,action_url,params);
 	};
+	static home = (biz9_config,params) => {
+		let action_url=PageType.get_title(PageType.HOME);
+		return get_cloud_url_main(biz9_config.APP_ID,biz9_config.URL,action_url,params);
+	};
 }
 class Team_Url {
 	static get = (biz9_config,title_url,params) => {
@@ -1404,6 +1486,7 @@ module.exports = {
 	Message,
 	Obj,
 	Page_Logic,
+	Page_Url,
 	Product_Url,
 	PageType,
 	Product_Logic,

package/package.json

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

package/test.js

@@ -1,18 +1,19 @@
 const path = require('path');
 const series = require('async-series');
-const {DataItem,DataType,Url,Obj,BiZ_Url,Cat,Stock,Schedule,Storage,Business,Product,Service,Event,Template,Page,Category,Review,Blog_Post,Faq_Logic,Category_Url,Blank_Url,Blank_Logic,Item_Logic,Service_Logic,Template_Logic,Page_Logic,Product_Logic,Event_Logic,Blog_Post_Logic,Content_Logic,Category_Logic,Team_Logic,Business_Logic} = require('./index');
+const {DataItem,DataType,Url,Obj,BiZ_Url,Cat,Stock,Schedule,Storage,Business,Product,Service,Event,Template,Page,Category,Review,Blog_Post,Faq_Logic,Category_Url,Blank_Url,Blank_Logic,Item_Logic,Service_Logic,Template_Logic,Page_Logic,Product_Logic,Event_Logic,Blog_Post_Logic,Content_Logic,Category_Logic,Team_Logic,Business_Logic,PageType,Page_Url} = require('./index');
 const {Log,Number} = require('biz9-utility');
 const {Scriptz}= require('biz9-scriptz');
 
 /* --- TEST CONFIG START --- */
 //const ID='0';
 const ID='f23c2372-df8e-4c09-a919-677fe32ba0bb';
-const APP_TITLE_ID='cool_bean';
+const APP_ID='cool_bean';
 const DATA_TYPE='dt_blank';
 const URL="http://localhost:1901";
 const biz9_config ={
     SERVICE_HOST_TYPE:'multiple',
-    APP_TITLE_ID:APP_TITLE_ID,
+    URL:'http://localhost:1901',
+    APP_ID:APP_ID,
     MONGO_IP:'0.0.0.0',
     MONGO_USERNAME_PASSWORD:'',
     MONGO_PORT_ID:"27019",
@@ -29,23 +30,40 @@ describe("connect", () => {
     it("_connect", () => {
         series([
 
-            /*
             function(call) {
-                console.log('GET-URL-START');
-                let biz9_config = Scriptz.get_biz9_config({biz9_config_file:path.resolve('../../biz9_config')});
+                //console.log('GET-URL-START');
+                //let biz9_config = Scriptz.get_biz9_config({biz9_config_file:path.resolve('../../biz9_config')});
                 //let action_url = 'test_get_url';
                 //let params = '&myparam1=p1&myparam2=p2'
-                let data_type = DataType.PRODUCT;
-                let id = "123";
-                //let cloud_url = BiZ_Url.get_item(biz9_config,data_type,id,"&cool=1");
-                let cloud_url = Category_Url.get_page(biz9_config,'cool');
-                Log.w('connect_url',cloud_url);
-                console.log('GET-URL-SUCCESS');
-                //call()
+                //let data_type = DataType.PRODUCT;
+                //let id = "123";
+                //let cloud_url = Page_Url.home(biz9_config);
+                //console.log(biz9_config);
+                //let cloud_url = Category_Url.get_page(biz9_config,'cool');
+                //let cloud_url = Category_Url.get_page(biz9_config,'cool');
+                //Log.w('cloud_url',cloud_url);
+                //console.log('GET-URL-SUCCESS');
+                call();
             },
-            */
 
             function(call) {
+                /* --PAGE--START */
+                //let page = Page_Logic.get_test()
+                //let page = Page_Logic.get_test("Page "+Number.get_id())
+                let page = Page_Logic.get_test("Page "+Number.get_id(),{get_value:true,value_count:5,get_section:false,section_count:2})
+                Log.w("page",page);
+                //Log.w("page_section_1",page.section_1);
+                //Log.w("page_section_6",page.section_6.items);
+                //Log.w("page_section_1_section_1",page.section_1.section_1);
+                //let page_list = Page_Logic.get_test_list({page_count:10});
+                //Log.w("Page_list",page_list);
+                /*
+                let page = Page.get_test({item_count:9,page_count:19,get_item:true,get_value:true})
+                //let page = Page.get_test()
+                Log.w("Page_section_1_section_1_section_1",page.section_1.section_1.section_1);
+                */
+                /* --PAGE--END */
+
 
                /* --TEAM--START */
                //let team = Team_Logic.get_test()
@@ -144,23 +162,6 @@ describe("connect", () => {
                 /* --PRODUCT--END */
 
 
-                /* --PAGE--START */
-                //let page = Page_Logic.get_test()
-                //let page = Page_Logic.get_test("Page "+Number.get_id())
-                let page = Page_Logic.get_test("Page "+Number.get_id(),{get_value:true,value_count:5,get_section:true,section_count:20})
-                Log.w("page",page);
-                Log.w("page_section_1",page.section_1);
-                Log.w("page_section_6",page.section_6.items);
-                //Log.w("page_section_1_section_1",page.section_1.section_1);
-                //let page_list = Page_Logic.get_test_list({page_count:10});
-                //Log.w("Page_list",page_list);
-                /*
-                let page = Page.get_test({item_count:9,page_count:19,get_item:true,get_value:true})
-                //let page = Page.get_test()
-                Log.w("Page_section_1_section_1_section_1",page.section_1.section_1.section_1);
-                */
-                /* --PAGE--END */
-
 
                /* --ITEM-TEST--START */
                 //let item = Item_Logic.get_test("Item_" +Number.get_id(),DataType.SERVICE,0);