biz9-logic 4.8.237 → 4.8.241

package/biz9_config

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

package/index.js

@@ -191,10 +191,18 @@ class Page_Logic {
 		}
 		return item_list;
 	};
-	static get_page_section = (type,page_id,section_id,value_id,value,value_list) => {
-		return {type:type,page_id:page_id,section_id:section_id,value_id:value_id,value:value,value_list:value_list};
-	};
-	static get_section_type_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'},
@@ -202,39 +210,50 @@ class Page_Logic {
 			{value:'list',label:'List'},
 		];
 	};
-	static get_section_property_type = (section_id,value_id,is_title) =>{
-		//section_1_value_1_type
-		//page['section_1_value_1_type'] -- / text,note,photo,list
-		return !is_title ? 'section_'+section_id + '_value_'+value_id + "_type" : 'Section '+section_id + ' Value '+value_id;
+	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_section_property_type_value = (type,section_id,value_id) =>{
-		//section_1_value_1_text_value
-    	//page['section_1_value_1_[text,note,photo,list]_value']
+	static get_page_value_field_title = (type,value_id,row_id) =>{
+		//text_value_1
 		let type_str = '';
 		switch(type){
-			case 'text':
-				type_str = 'text';
+			case FieldType.PAGE_VALUE_FIELD_TYPE_TEXT:
+				return 'text'+'_value_'+value_id;
 				break;
-			case 'note':
-				type_str = 'note';
+			case FieldType.PAGE_VALUE_FIELD_TYPE_NOTE:
+				return 'note'+'_value_'+value_id;
 				break;
-			case 'photo':
-				type_str = 'photo';
+			case FieldType.PAGE_VALUE_FIELD_TYPE_PHOTO:
+				return 'photo'+'_value_'+value_id;
 				break;
-			case 'list':
-				type_str = 'list';
+			case FieldType.PAGE_VALUE_FIELD_TYPE_LIST:
+				return 'list'+'_value_'+value_id +'_row_'+row_id;
 				break;
+			default:
+				return "";
 		};
-		return 'section_'+section_id + '_value_'+value_id + "_" + type_str + "_value";
-	}
-
-	static get_section_property_type_list_value = (section_id,value_id,row_id) =>{
-		//page['section_1_value_1_type'] -- / list
-    	//page['section_1_value_1_list_value_1']
-    	//page['section_1_value_1_list_value_2']
-    	//page['section_1_value_1_list_value_3']
-		//section_1_value_2_list_field_value_3
-		return 'section_'+section_id + '_value_'+value_id + "_list_value_" +row_id;
 	}
 }
 class Order_Logic {
@@ -805,6 +824,7 @@ class FieldType {
 	static STAT_ORDER_ADD_ID='5';
 	static STAT_REVIEW_ADD_ID='6';
 
+	/*
 	static KEY_ADMIN="key_admin";
 	static KEY_APP_ID="key_app_id";
 	static KEY_BUSINESS="key_business";
@@ -812,6 +832,7 @@ class FieldType {
 	static KEY_CART="key_cart";
 	static KEY_ORDER="key_order";
 	static KEY_USER="key_user";
+	*/
 
 	static ORDER_NUMBER="OR-";
 	static CART_NUMBER="CA-";
@@ -850,13 +871,10 @@ class FieldType {
 	static ACTIVITY_TYPE_LOGIN="login";
 	static ACTIVITY_TYPE_REGISTER="register";
 
-	static SECTION_TYPE_TEXT="text";
-	static SECTION_TYPE_NOTE="note";
-	static SECTION_TYPE_PHOTO="photo";
-	static SECTION_TYPE_LIST="list";
-
-	static SECTION_TYPE_LIST_FIELD="field";
-	static SECTION_TYPE_LIST_VALUE="value";
+	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";
 }
 class Social {
 	static FACEBOOK_URL="https://facebook.com/";

package/package.json

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

package/test.js

@@ -32,7 +32,17 @@ describe("connect", () => {
 
             function(call) {
                 //console.log('PAGE-SECTION-START');
-                console.log(Page_Logic.get_page_section('text',1,2,3,'cool',null));
+                let page = Page_Logic.get_test();
+                //page[Page_Logic.get_page_value_field_title('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';
+                //Log.w('page',page);
+                Log.w('list_1_value',Page_Logic.get_page_value_field_value(FieldType.PAGE_VALUE_TYPE_LIST,page,1));
+                //Log.w('list_1_value',Page_Logic.get_page_value_field_value(FieldType.PAGE_VALUE_TYPE_LIST,1,1));
+
+
+                //console.log(Page_Logic.get_page_value_field_title('text',1));
                 //console.log(Page_Logic.get_page_section_type_list());
                 //console.log(Page_Logic.get_section_property_type(1,2,true));
                 //console.log(Page_Logic.get_section_property_type_value('text',1,2,true));