biz9-logic 4.0.11 → 4.0.16

package/biz9_config

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

package/index.js

@@ -26,46 +26,12 @@ class Template{
 			DataItem.get_new(DataType.TEMPLATE,0),
 			DataItem.get_new(DataType.TEMPLATE,0),
 			Field.get_test("Primary"));
-		template=Sub_Item.get_list(template,Section.get_test_list(template,template));
-		let temp_sub_list = get_test_list(template);
-		template = Sub_Item.get_list(template,temp_sub_list);
-		function get_test_list(template){
-			let template_title_list = ["Header","Navigation","Body","Footer"];
-			let template_sub_item_list = [];
-			for(let a=0;a<template_title_list.length;a++){
-				let template_sub_item = DataItem.get_new_full_item(
-					DataItem.get_new(DataType.ITEM,Number.get_id()),
-					DataItem.get_new(DataType.TEMPLATE,template.id),
-					DataItem.get_new(DataType.TEMPLATE,template.id),
-					Field.get_test( template_title_list[a] ));
-				template_sub_item = Sub_Item.get_list(template_sub_item,Section.get_test_list(template_sub_item,template));
-				template_sub_item_list.push(template_sub_item);
-			}
-			return template_sub_item_list;
-		}
-		function get_item_section_list(parent_item,top_item){
-			let new_list = [];
-			for(let a=1;a<3;a++){
-				let item_title = "Section " + String(a);
-				let item = DataItem.get_new(
-					DataType.ITEM,Number.get_id(), {
-						top_id:top_item.id,
-						top_data_type:top_item.data_type,
-						parent_id:parent_item.id,
-						parent_data_type:parent_item.data_type,
-						title:item_title,
-						title_url:Str.get_title_url(item_title),
-						sub_note:"Sub Note "+String(Number.get_id()),
-						note:"Note "+String(Number.get_id()),
-					}
-				);
-				for(let b=1;b<3;b++){
-					item['value_'+String(b)] = 'Section '+ String(a) + ' value ' + String(b);
-				}
-				new_list.push(item);
-			}
-			return new_list;
+		let template_sub_title_list = ["Header","Navigation","Body","Footer"];
+		for(let a=0;a<template_sub_title_list.length;a++){
+				template = Sub_Item.get_test_bind_new_child(Number.get_id(),template_sub_title_list[a],template,template,template);
 		}
+		template = Sub_Item.get_test_bind_item_sub_item(template);
+		Log.w('template_sec',template.header.section_1.section_1);
 		return template;
 	};
 }
@@ -73,50 +39,64 @@ class Page{
 	static get_test = (title) =>{
 		let page = DataItem.get_new_full_item(
 			DataItem.get_new(DataType.PAGE,Number.get_id()),
-			DataItem.get_new(DataType.PAGE,Number.get_id()),
-			DataItem.get_new(DataType.PAGE,Number.get_id()),
-			Field.get_test("Page " + Number.get_id()));
-			return Sub_Item.get_list(page,Section.get_test_list(page,page));
+			DataItem.get_new(DataType.PAGE,0),
+			DataItem.get_new(DataType.PAGE,0),
+			Field.get_test(title));
+		for(let a=0;a<10;a++){
+			page=Sub_Item.get_test_bind_new_child(Number.get_id(),"Page " + String(a),page,page,page);
+		}
+		page = Sub_Item.get_test_bind_item_sub_item(page);
+	return page;
 	};
 }
 class Product{
-	static get_test = () =>{
+	static get_test = (title) =>{
 		let product = DataItem.get_new_full_item(
 			DataItem.get_new(DataType.PRODUCT,Number.get_id()),
-			DataItem.get_new(DataType.PRODUCT,Number.get_id()),
-			DataItem.get_new(DataType.PRODUCT,Number.get_id()),
-			Field.get_test("Product " + Number.get_id()));
+			DataItem.get_new(DataType.PRODUCT,0),
+			DataItem.get_new(DataType.PRODUCT,0),
+			Field.get_test(title));
+		product = Sub_Item.get_test_bind_new_child(Number.get_id(),title,product,product,product);
 		product.cost = String(Number.get_id()) + "." + String(Number.get_id());
 		product.old_cost = String(Number.get_id()) + "." + String(Number.get_id());
 		product.type = "Type "+String(Number.get_id());
 		product.sub_type = "Sub Type "+String(Number.get_id());
 		product.stock = String(Number.get_id(3-1));
-		return Sub_Item.get_list(product,Section.get_test_list(product,product));
+		for(let a=0;a<10;a++){
+			product=Sub_Item.get_test_bind_new_child(Number.get_id(),"Section " + String(a),product,product,product);
+		}
+		product = Sub_Item.get_test_bind_item_sub_item(product);
+	return product;
 	};
 }
 class Service{
-	static get_test = () =>{
+	static get_test = (title) =>{
 		let service = DataItem.get_new_full_item(
 			DataItem.get_new(DataType.SERVICE,Number.get_id()),
-			DataItem.get_new(DataType.SERVICE,Number.get_id()),
-			DataItem.get_new(DataType.SERVICE,Number.get_id()),
-			Field.get_test("Service " + Number.get_id()));
+			DataItem.get_new(DataType.SERVICE,0),
+			DataItem.get_new(DataType.SERVICE,0),
+			Field.get_test(title));
+		service = Sub_Item.get_test_bind_new_child(Number.get_id(),title,service,service,service);
 		service.cost = String(Number.get_id()) + "." + String(Number.get_id());
 		service.old_cost = String(Number.get_id()) + "." + String(Number.get_id());
 		service.type = "Type "+String(Number.get_id());
 		service.sub_type = "Sub Type "+String(Number.get_id());
 		service.stock = String(Number.get_id(3-1));
-		service.items = Section.get_test_list(service,service);
-		return Sub_Item.get_list(service,Section.get_test_list(service,service));
+		for(let a=0;a<10;a++){
+			service=Sub_Item.get_test_bind_new_child(Number.get_id(),"Section " + String(a),service,service,service);
+		}
+		service = Sub_Item.get_test_bind_item_sub_item(service);
+		return service;
 	};
 }
 class Event{
-	static get_test = () =>{
+	static get_test = (title) =>{
 		let event = DataItem.get_new_full_item(
 			DataItem.get_new(DataType.EVENT,Number.get_id()),
-			DataItem.get_new(DataType.EVENT,Number.get_id()),
-			DataItem.get_new(DataType.EVENT,Number.get_id()),
-			Field.get_test("Event " + Number.get_id()));
+			DataItem.get_new(DataType.EVENT,0),
+			DataItem.get_new(DataType.EVENT,0),
+			Field.get_test(title));
+		event = Sub_Item.get_test_bind_new_child(Number.get_id(),title,event,event,event);
 		event.cost = String(Number.get_id()) + "." + String(Number.get_id());
 		event.old_cost = String(Number.get_id()) + "." + String(Number.get_id());
 		event.date = String(String(Number.get_id(2030)) + "-" + String(Number.get_id(13)) + "-" + String(Number.get_id(30))).trim();
@@ -125,59 +105,31 @@ class Event{
 		event.location = "Location "+String(Number.get_id());
 		event.meeting_link = "Meeting Link "+String(Number.get_id());
 		event.stock = String(Number.get_id(3-1));
-		event.items = Section.get_test_list(event,event);
-		return Sub_Item.get_list(event,Section.get_test_list(event,event));
+		for(let a=0;a<10;a++){
+			event=Sub_Item.get_test_bind_new_child(Number.get_id(),"Section " + String(a),event,event,event);
+		}
+		event = Sub_Item.get_test_bind_item_sub_item(event);
+		return event;
 	};
 }
-class Section{
-	static get_test_list = (parent_item,top_item) =>{
-		let items = get_item_section_list(parent_item,top_item);
-
-		function get_item_section_list(parent_item,top_item){
-			let new_list = [];
-			for(let a=1;a<10;a++){
-				let item_title = "Section " + String(a);
-				let item = DataItem.get_new(
-					DataType.ITEM,Number.get_id(), {
-						top_id:top_item.id,
-						top_data_type:top_item.data_type,
-						parent_id:parent_item.id,
-						parent_data_type:parent_item.data_type,
-						title:item_title,
-						title_url:Str.get_title_url(item_title),
-						sub_note:"Sub Note "+String(Number.get_id()),
-						note:"Note "+String(Number.get_id()),
-						date_create:new moment().toISOString(),
-						date_save:new moment().toISOString(),
+				class Field{
+					static get_test = (title) =>{
+						let item = {
+							date_create:new moment().toISOString(),
+							date_save:new moment().toISOString(),
+							title:title,
+							setting_visible:"1",
+							photo_data:"/images/no_img.jpg",
+							title_url:Str.get_title_url(title),
+							sub_note : "Sub Note "+String(Number.get_id()),
+							note : "Note "+String(Number.get_id())
+						}
+						for(let b = 1;b<20;b++){
+							item['value_'+String(b)] = 'value ' + String(b);
+						}
+						return item;
 					}
-				);
-				for(let b=1;b<20;b++){
-					item['value_'+String(b)] = 'Section '+ String(a) + ' value ' + String(b);
 				}
-				new_list.push(item);
-			}
-			return new_list;
-		}
-		return items;
-	};
-}
-class Field{
-	static get_test = (title) =>{
-		let item = {
-			date_create:new moment().toISOString(),
-			date_save:new moment().toISOString(),
-			title:title,
-			setting_visible:"1",
-			title_url:Str.get_title_url(title),
-			sub_note : "Sub Note "+String(Number.get_id()),
-			note : "Note "+String(Number.get_id())
-		}
-		for(let b = 1;b<20;b++){
-			item['value_'+String(b)] = 'value ' + String(b);
-		}
-		return item;
-	}
-}
 class FieldType {
 	static APP_ID='app_id';
 	static ID='id';
@@ -429,7 +381,6 @@ class Obj {
 		return get_cloud_filter_obj_main(data_type,filter,sort_by,page_current,page_size);
 	}
 };
-
 class Cat {
 	static get_category_drop_down_list_by_list = (cat_list) => {
 		let category_list = [];
@@ -720,27 +671,55 @@ class Storage {
 	}
 }
 class Sub_Item{
-	static get_list = (parent_item, item_list) => {
-		parent_item.items = [];
-		for(let a=0; a<item_list.length; a++){
-			let item_title_url = Str.get_title_url(item_list[a].title);
-			let new_item = item_list[a];
-			new_item.items = [];
-			item_list[item_title_url] = item_list[a];
-			for(let b=0;b<item_list.length;b++){
-				let sub_item_title_url = Str.get_title_url(item_list[b].title);
-				if(item_list[a].id == item_list[b].parent_id){
-					let sub_item = item_list[b];
-					new_item.items.push(sub_item);
-					item_list[a][sub_item_title_url] = sub_item;
-					item_list[a][sub_item_title_url].items = [];
+	static get_bind_new_child = (id,title,item,parent_item,top_item,options) =>{
+		let new_sub_item = DataItem.get_new_full_item(
+			DataItem.get_new(DataType.ITEM,id),
+			DataItem.get_new(parent_item.data_type,parent_item.id),
+			DataItem.get_new(top_item.data_type,top_item.id)
+		);
+		new_sub_item.title = title;
+		if(options){
+			for (const key in options) {
+				item[key] = options[key];
+			}
+		}
+		if(!item.items){
+			item.items = [];
+		}
+		item[Str.get_title_url(title)] = new_sub_item;
+		item.items.push(new_sub_item);
+		return item;
+	};
+	static get_test_bind_item_sub_item = (item) =>{
+		for(let b=0;b<item.items.length;b++){
+			for(let c=0;c<20;c++){
+				item.items[b]=Sub_Item.get_test_bind_new_child(Number.get_id(),'Section '+String(c),item.items[b],item,item);
+				for(let d=0;d<item.items[b].items.length;d++){
+					item.items[b].items[d]=Sub_Item.get_test_bind_new_child(Number.get_id(),'Section '+String(d),item.items[b].items[d],item.items[b],item);
 				}
 			}
-			parent_item[item_title_url] = item_list[a];
-			parent_item.items.push(item_list[a]);
 		}
-		return parent_item;
+		return item;
 	}
+	static get_test_bind_new_child = (id,title,item,parent_item,top_item,options) =>{
+		let new_sub_item = DataItem.get_new_full_item(
+			DataItem.get_new(DataType.ITEM,id),
+			DataItem.get_new(parent_item.data_type,parent_item.id),
+			DataItem.get_new(top_item.data_type,top_item.id),
+			Field.get_test(title));
+		new_sub_item.title = title;
+		if(options){
+			for (const key in options) {
+				item[key] = options[key];
+			}
+		}
+		if(!item.items){
+			item.items = [];
+		}
+		item[Str.get_title_url(title)] = new_sub_item;
+		item.items.push(new_sub_item);
+		return item;
+	};
 }
 module.exports = {
 	BiZ_Url,
@@ -749,6 +728,7 @@ module.exports = {
 	CMS,
 	DataItem,
 	DataType,
+	Field,
 	FieldType,
 	Event,
 	Message,

package/main.js

@@ -4,16 +4,14 @@ Author: certifiedcoderz@gmail.com (Certified CoderZ)
 License GNU General Public License v3.0
 Description: BiZ9 Framework: Logic - Main
 */
-
 const { DateTime,Number } = require('biz9-utility');
 const biz9_config_local=__dirname+"/../../"+"biz9_config";
-
 const get_cloud_filter_obj_main = (data_type,filter,sort_by,page_current,page_size) => {
     return {data_type:data_type,filter:filter,sort_by:sort_by,page_current:page_current,page_size:page_size};
 }
 const get_new_item_main = (data_type,id,options) => {
     if(!id){
-        id=0;
+        id='0';
     }
     let item = {data_type:data_type,id:id};
     if(!options){
@@ -45,7 +43,6 @@ const get_new_full_item_main = (org_item,parent_item,top_item,options) => {
     }
     return item;
 }
-
 const get_cloud_url_main = (app_id,domain_url,action_url,params) =>{
     if(!params){
         params='';
@@ -53,100 +50,16 @@ const get_cloud_url_main = (app_id,domain_url,action_url,params) =>{
     var app_id_url='?app_id='+app_id;
     return domain_url+"/"+action_url+app_id_url + params;
 }
-const get_biz_item_main=(biz9_config,item,options) =>{
-    /*
-    -options {
-        get_count: true/false, false=default --
-        get_date: true/false, false=default --
-        get_biz_map: true/false, false=default --
-        get_money: true/false, false=default --
-    }
-    */
-    //money setting - start
-    if(options.get_money){
-        if(isNaN(item.cost)){
-            item.cost=parseFloat(0.00);
-        }
-        if(isNaN(item.old_cost)){
-            item.old_cost=parseFloat(0.00);
-        }
-        if(isNaN(item.discount)){
-            item.discount=parseFloat(0.00);
-        }
-        discount = item.old_cost - item.cost;
-        item.discount= parseInt(((discount / item.old_cost) * 100));
-        if(isNaN(item.discount)){
-            item.discount="0%";
-        }else{
-            item.discount=item.discount+"%";
-        }
-        item.cost = Number.get_money(item.cost);
-        item.old_cost = Number.get_money(item.old_cost);
-    }
-    //money setting - end
-
-    //count setting - start
-    if(options.get_count){
-        if(!item.view_count){
-            item.view_count='0';
-        }
-        if(!item.like_count){
-            item.like_count='0';
-        }
-        if(!item.review_count){
-            item.review_count='0';
-        }
-    }
-    //count setting - end
-    //date setting - start
-    if(options.get_date){
-        let no_date_str='';
-        if(!item.date_create){
-            item.date_create = DateTime.get_new_date();
-            item.date_save = DateTime.get_new_date();
-        }
-        item={
-            pretty_create: (item.date_create) ? DateTime.get_pretty(item.date_create) : no_date_str,
-            pretty_update: (item.date_create) ? DateTime.get_pretty(item.date_save): no_date_str,
-            full_date_create: (item.date_create) ? DateTime.get_date_str(item.date_create) : no_date_str,
-            full_date_update: (item.date_create) ? DateTime.get_date_str(item.date_save) : no_date_str,
-            full_date_time_create: (item.date_create) ? DateTime.get_str(item.date_create) : no_date_str,
-            full_date_time_update: (item.date_create) ? DateTime.get_str(item.date_save) : no_date_str,
-            month_create: (item.date_create) ? DateTime.get_month_title(1+DateTime.get_obj(item.date_create).month()) : no_date_str,
-            month_update: (item.date_create) ? DateTime.get_month_title(1+DateTime.get_obj(item.date_save).month()) : no_date_str,
-            mo_create: (item.date_create) ? (1+DateTime.get_obj(item.date_create).month()) : no_date_str,
-            mo_update: (item.date_create) ? (1+DateTime.get_obj(item.date_save).month()) : no_date_str,
-            date_create: (item.date_create) ? DateTime.get_obj(item.date_create).date() : no_date_str,
-            year_create: (item.date_create) ? DateTime.get_obj(item.date_create).year() : no_date_str,
-            year_update: (item.date_create) ? DateTime.get_obj(item.date_save).year() : no_date_str,
-            time_create: (item.date_create) ? DateTime.get_time_str(item.date_create) : no_date_str,
-            time_update: (item.date_create) ? DateTime.get_time_str(item.date_save) : no_date_str,
-        }
-    }
-    //date setting - end
-    //biz_map setting - start
-    if(options.get_biz_map){
-        for(let a=0;a<20;a++){
-            if(item['field_'+a]){
-                item[item['field_'+a]]=item['value_'+a];
-            }
-        }
-    }
-    //biz_map setting - end
-    return item;
-}
 const get_title_url_main = (title) => {
     if(!title){
         title='';
     }
     return title.replace(/[^a-z0-9]+/ig, "_").toLowerCase();
 }
-
 module.exports = {
     get_new_item_main,
     get_cloud_url_main,
     get_cloud_filter_obj_main,
     get_title_url_main,
-    get_biz_item_main,
     get_new_full_item_main
 };

package/package.json

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

package/test.js

@@ -33,11 +33,13 @@ describe("connect", () => {
                 console.log('CONNECT-START');
                 //let biz9_config = Scriptz.get_biz9_config({biz9_config_file:path.resolve('../../biz9_config')});
                 //let cloud_url = Url.connect(biz9_config);
+                //console.log(Template.get_test()); //get_template_test
                 //console.log(Business.get_test()); // get_business_test
-                //console.log(Page.get_test()); // get_page_test
-                console.log(Event.get_test());
-                //console.log(Template.get_test());
-                //console.log(Product.get_test());
+                //console.log(Page.get_test("Page " +String(Number.get_id()))); // get_page_test
+                //console.log(Event.get_test());
+                //console.log(Product.get_test("Product " +String(Number.get_id()))); // get_product_test
+                //console.log(Service.get_test("Service " +String(Number.get_id()))); // get_service_test
+                console.log(Event.get_test("Event " +String(Number.get_id()))); // get_service_test
                 //let product = Product.get_test();
                 //console.log(product.section_1);
                 //get page