biz9-logic 4.8.58 → 4.8.62

package/biz9_config

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

package/index.js

@@ -43,6 +43,54 @@ class Item_Logic {
 		}
 		return item_list;
 	}
+	static get_search_query(search){
+		let url = "";
+		if(search.data_type){
+			url = url + "&data_type="+search.data_type;
+		}else{
+			url = url + "&data_type="+DataType.BLANK;
+		}
+		if(search.sort_by_key){
+			url = url + "&sort_by_key="+search.sort_by_key;
+		}else{
+			url = url + "&sort_by_key=title";
+		}
+		if(search.sort_by_value){
+			url = url + "&sort_by_value="+search.sort_by_value;
+		}else{
+			url = url + "&sort_by_value=-1";
+		}
+		if(search.page_current){
+			url = url + "&page_current="+search.page_current;
+		}else{
+			url = url + "&page_current=1";
+		}
+		if(search.page_size){
+			url = url + "&page_size="+search.page_size;
+		}else{
+			url = url + "&page_size=9";
+		}
+		for(let a=1;a<19;a++){
+			if(!Str.check_is_null(search['filter_key_'+String(a)])){
+			url = url + "&filter_key_"+String(a)+"="+ search['filter_key_'+String(a)];
+			url = url + "&filter_value_"+String(a)+"="+ search['filter_value_'+String(a)];
+			}
+		}
+		return url;
+	}
+	static get_search_by_query(query){
+		let filter = [];
+		let sort_by = [];
+		if(query['sort_by_key']){
+			sort_by[query['sort_by_key']] = query['sort_by_value'];
+		}
+		for(let a = 0; a < 19; a++){
+			if(query['filter_key_'+a]){
+				filter[query['filter_key_'+a]] = query['filter_value_'+a]
+			}
+		}
+		return Item_Logic.get_search(query.data_type,filter,sort_by,query.page_current,query.page_size);
+	}
 	static get_search = (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};
 	}
@@ -60,7 +108,12 @@ class Template_Logic {
 			DataItem.get_new(DataType.TEMPLATE,0),
 			Field_Logic.get_test(title,option));
 		if(option.get_item){
-			template.items = Sub_Item_Logic.get_test_list(template,template,option);
+			let title_list = ['Header','Body','Footer','Navigation']
+			//template.items = Sub_Item_Logic.get_test_list(template,template,option);
+			template.items = [];
+			for(let a = 0; a<title_list.length;a++){
+				template.items.push(Sub_Item_Logic.get_test(title_list[a],template,template,option));
+			}
 			if(option.get_item_bind){
 			template = Sub_Item_Logic.bind_parent_child_list(template,template.items);
 			}
@@ -471,7 +524,7 @@ class Field_Logic {
 			option.section_count = option.section_count ? option.section_count : 9;
 			option.get_section = option.get_section ? true : false;
 		}
-		if(option.data_type==DataType.PRODUCT){
+		if(data_type==DataType.PRODUCT){
 			option.product_count = option.product_count ? option.product_count : 9;
 		}
 		if(data_type==DataType.SERVICE){
@@ -589,6 +642,10 @@ class PageType {
 	static BLOG_POST_BROWSE='blog_post_browse';
 	static BLOG_POST_DETAIL='blog_post_detail';
 
+	static CATEGORY='category';
+	static CATEGORY_BROWSE='category_browse';
+	static CATEGORY_DETAIL='category_detail';
+
 	static EVENT='event';
 	static EVENT_BROWSE='event_browse';
 	static EVENT_DETAIL='event_detail';

package/package.json

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

package/test.js

@@ -82,6 +82,21 @@ describe("connect", () => {
 
                /* --SEARCH--START */
                 //console.log(Url.get_search(DataType.BLOG_POST,{title:-1},{cool:-1},1,10));
+
+                /*
+                let data_type = DataType.PRODUCT;
+                let search_filter_key_1 = 'key1';
+                let search_filter_value_1 = 'value1';
+                let search_filter_key_2 = 'key2';
+                let search_filter_value_2 = 'value2';
+                */
+
+
+                //let query = "?app_id=19&data_type="+data_type+"&sort_by={}&page_current=1&page_size=99&search_filter_key_1="+search_filter_key_1+"&search_filter_value_1="+search_filter_value_1+"&search_filter_key_2="+search_filter_key_2+"&search_filter_value_2="+search_filter_value_2;
+
+                //Log.w('query',query);
+
+
                /* --SEARCH--END */
 
                /* --CATEGORY--START */
@@ -198,11 +213,11 @@ describe("connect", () => {
 
             /* --TEMPLATE--START */
                 //let template = Template_Logic.get_test("Primary",{});
-                //let template = Template_Logic.get_test("Primary",{get_value:true,get_item:true,item_count:2});
+                let template = Template_Logic.get_test("Primary",{get_value:true,get_item:true});
                 /*
                 let template_item_list = Template_Logic.get_test("Primary",template,template,{get_value:false,get_item:false,item_count:2});
                 */
-                //Log.w('template',template);
+                Log.w('template',template);
                 //Log.w('template_item_list',template_item_list);
                 /* --TEMPLATE--END */
 
@@ -277,7 +292,7 @@ describe("connect", () => {
 
                 /* --REVIEW--START */
                 //Log.w("Review",Review.get_test());
-                Log.w("Review List",Review_Logic.get_test_list());
+                //Log.w("Review List",Review_Logic.get_test_list());
                 /*
                 let review_list = Review.get_test_list({review_count:3,get_item:true})
                 Log.w("Review List",review_list);