biz9-logic 4.8.249 → 4.8.251

package/biz9_config

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

package/index.js

@@ -127,6 +127,57 @@ class Item_Logic {
 		}
 		return Item_Logic.get_search(query.data_type,filter,sort_by,query.page_current,query.page_size);
 	}
+	static get_field_value = (type,item_id,value_id,value,value_list) => {
+		return {type:type,item_id:item_id,value_id:value_id,value:value,value_list:value_list};
+	};
+	static get_item_field_value_type_list = () => {
+		return [
+			{value:'text',label:'Text'},
+			{value:'note',label:'Note'},
+			{value:'photo',label:'Photo'},
+			{value:'list',label:'List'},
+		];
+	};
+	static get_field_value_value = (type,item,value_id) =>{
+		switch(type){
+			case FieldType.ITEM_FIELD_VALUE_TYPE_TEXT:
+			case FieldType.ITEM_FIELD_VALUE_TYPE_NOTE:
+			case FieldType.ITEM_FIELD_VALUE_TYPE_PHOTO:
+				return !Str.check_is_null(item[Item_Logic.get_field_value_title(type,value_id)]) ? item[Item_Logic.get_field_value_title(type,value_id)] : "";
+				break;
+			case FieldType.ITEM_FIELD_VALUE_TYPE_LIST:
+				let r_list = [];
+				for(let a=0;a<30;a++){
+					if(!Str.check_is_null(item[Item_Logic.get_field_value_title(type,value_id,a+1)])){
+						r_list.push(item[Item_Logic.get_field_value_title(type,value_id,a+1)]);
+					}
+				}
+				return r_list;
+				break;
+			default:
+				return "";
+		};
+	}
+	static get_field_value_title = (type,value_id,row_id) =>{
+		let type_str = '';
+		switch(type){
+			case FieldType.ITEM_FIELD_VALUE_TYPE_TEXT:
+				return 'text'+'_value_'+value_id;
+				break;
+			case FieldType.ITEM_FIELD_VALUE_TYPE_NOTE:
+				return 'note'+'_value_'+value_id;
+				break;
+			case FieldType.ITEM_FIELD_VALUE_TYPE_PHOTO:
+				return 'photo'+'_value_'+value_id;
+				break;
+			case FieldType.ITEM_FIELD_VALUE_TYPE_LIST:
+				return 'list'+'_value_'+value_id +'_row_'+row_id;
+				break;
+			default:
+				return "";
+		};
+	}
+
 }
 class Stat_Logic {
 	/*
@@ -165,70 +216,6 @@ class Page_Logic {
 		}
 		return item_list;
 	};
-	//text_value_1
-	//note_value_1
-	//photo_value_1
-	//list_value_1
-	//list_value_1_1
-	//list_value_1_2
-	//list_value_1_3
-	//page['section_1_value_1_type'] -- / text,note,photo,list
-	static get_page_value_field = (type,page_id,value_id,value,value_list) => {
-		return {type:type,page_id:page_id,value_id:value_id,value:value,value_list:value_list};
-	};
-	static get_page_value_type_list = () => {
-		return [
-			{value:'text',label:'Text'},
-			{value:'note',label:'Note'},
-			{value:'photo',label:'Photo'},
-			{value:'list',label:'List'},
-		];
-	};
-	static get_page_value = (type,page_id,value_id,value,value_list) => {
-       return {type:type,page_id:page_id,value_id:value_id,value:value,value_list:value_list};
-    };
-	static get_page_value_field_value = (type,page,value_id) =>{
-		//text_value_1
-    	//page['[text,note,photo]_value_1']
-		switch(type){
-			case FieldType.PAGE_VALUE_FIELD_TYPE_TEXT:
-			case FieldType.PAGE_VALUE_FIELD_TYPE_NOTE:
-			case FieldType.PAGE_VALUE_FIELD_TYPE_PHOTO:
-				return !Str.check_is_null(page[Page_Logic.get_page_value_field_title(type,value_id)]) ? page[Page_Logic.get_page_value_field_title(type,value_id)] : "";
-				break;
-			case FieldType.PAGE_VALUE_FIELD_TYPE_LIST:
-				let r_list = [];
-				for(let a=0;a<30;a++){
-					if(!Str.check_is_null(page[Page_Logic.get_page_value_field_title(type,value_id,a+1)])){
-						r_list.push(page[Page_Logic.get_page_value_field_title(type,value_id,a+1)]);
-					}
-				}
-				return r_list;
-				break;
-			default:
-				return "";
-		};
-	}
-	static get_page_value_field_title = (type,value_id,row_id) =>{
-		//text_value_1
-		let type_str = '';
-		switch(type){
-			case FieldType.PAGE_VALUE_FIELD_TYPE_TEXT:
-				return 'text'+'_value_'+value_id;
-				break;
-			case FieldType.PAGE_VALUE_FIELD_TYPE_NOTE:
-				return 'note'+'_value_'+value_id;
-				break;
-			case FieldType.PAGE_VALUE_FIELD_TYPE_PHOTO:
-				return 'photo'+'_value_'+value_id;
-				break;
-			case FieldType.PAGE_VALUE_FIELD_TYPE_LIST:
-				return 'list'+'_value_'+value_id +'_row_'+row_id;
-				break;
-			default:
-				return "";
-		};
-	}
 }
 class Order_Logic {
 	static get_order_number = () => {
@@ -868,10 +855,10 @@ class FieldType {
 	static ACTIVITY_TYPE_LOGIN="login";
 	static ACTIVITY_TYPE_REGISTER="register";
 
-	static PAGE_VALUE_FIELD_TYPE_TEXT="text";
-	static PAGE_VALUE_FIELD_TYPE_NOTE="note";
-	static PAGE_VALUE_FIELD_TYPE_PHOTO="photo";
-	static PAGE_VALUE_FIELD_TYPE_LIST="list";
+	static ITEM_FIELD_VALUE_TYPE_TEXT="text";
+	static ITEM_FIELD_VALUE_TYPE_NOTE="note";
+	static ITEM_FIELD_VALUE_TYPE_PHOTO="photo";
+	static ITEM_FIELD_VALUE_TYPE_LIST="list";
 }
 class Social {
 	static FACEBOOK_URL="https://facebook.com/";
@@ -910,7 +897,6 @@ class PageType {
 			return String(Str.get_title(data_type.replaceAll('_',' '))).trim();
 		}
 	}
-
 }
 class DataType {
 
@@ -951,7 +937,7 @@ class DataType {
 	static USER='user_biz';
 	static VIDEO='video_biz';
 
-	static get_data_type_title = (data_type,get_plural) => {
+	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){
@@ -964,7 +950,7 @@ class DataType {
 		}
 
 	}
-	static get_data_type_url(data_type){
+	static get_url(data_type){
 		switch(data_type){
 			case DataType.ACTIVITY:
 				return 'activity';
@@ -1006,7 +992,7 @@ class DataType {
 				return 'custom_field';
 		}
 	}
-	static get_item_list = () =>{
+	static get_list = () =>{
 		return [
 			{	title:DataType.get_title(DataType.BLOG_POST),type:DataType.BLOG_POST},
 			{	title:DataType.get_title(DataType.EVENT),type:DataType.EVENT},

package/package.json

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

package/test.js

@@ -31,18 +31,21 @@ describe("connect", () => {
         series([
 
             function(call) {
-                //console.log('ITEM-START');
+                console.log('ITEM-START');
                 //let gallery = Gallery_Logic.get_test('Gallery 1',{get_blank:true});
                 //console.log(gallery);
                 //console.log('ITEM-END');
-                //let page = Page_Logic.get_test();
-                //page[Page_Logic.get_page_value_field_title(FieldType.PAGE_VALUE_FIELD_TYPE_TEXT,1)] = 'apple';
-                //page[Page_Logic.get_page_value_field_title('list',1,1)] = 'cool';
-                //page[Page_Logic.get_page_value_field_title('list',1,2)] = 'apple';
-                //page[Page_Logic.get_page_value_field_title('list',1,3)] = 'sauce';
+                console.log('aaaaaaaaaa');
+                console.log(Item_Logic.get_field_value_title(FieldType.ITEM_FIELD_VALUE_TYPE_LIST,1,1));
+                console.log('bbbbbb');
+                let page = Page_Logic.get_test();
+                //page[Item_Logic.get_field_value_title(FieldType.ITEM_FIELD_VALUE_TYPE_TEXT,1)] = 'apple';
+                page[Item_Logic.get_field_value_title(FieldType.ITEM_FIELD_VALUE_TYPE_LIST,1,1)] = 'cool';
+                page[Item_Logic.get_field_value_title('list',1,2)] = 'apple';
+                page[Item_Logic.get_field_value_title('list',1,3)] = 'sauce';
                 //Log.w('page',page);
-                //Log.w('text_1_value',Page_Logic.get_page_value_field_value(FieldType.PAGE_VALUE_FIELD_TYPE_TEXT,page,1));
-                //Log.w('list_1_value',Page_Logic.get_page_value_field_value(FieldType.PAGE_VALUE_FIELD_TYPE_LIST,page,1));
+                //Log.w('text_1_value',Item_Logic.get_field_value_value(FieldType.ITEM_FIELD_VALUE_TYPE_TEXT,page,1));
+                Log.w('list_1_value',Item_Logic.get_field_value_value(FieldType.ITEM_FIELD_VALUE_TYPE_LIST,page,1));
 
 
                 //console.log(Page_Logic.get_page_value_field_title('text',1));
@@ -54,11 +57,13 @@ describe("connect", () => {
                 //console.log('PAGE-SECTION-END');
 
 
+                /*
                 console.log('PRODUCT-URL-START');
                 let search = Item_Logic.get_search(DataType.PRODUCT,{},{},1,0);
                 let cloud_url = Product_Url.search(APP_ID,URL,search);
                 console.log(cloud_url);
                 console.log('PRODUCT-URL-END');
+                */
                 //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'