biz9-logic 4.9.92 → 4.9.94

package/biz9_config

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

package/index.js

@@ -1103,9 +1103,6 @@ class Event_Logic {
 	};
 }
 class Field_Logic {
-	static get_field_value_old = (item_data_type,item_id,value_type,value_id,value,value_list) => {
-		return {item_data_type:item_data_type,item_id:item_id,value_type:value_type,value_id:value_id,value:value,value_list:value_list};
-	};
 	static get_item_field_value_type_list = () => {
 		return [
 			{value:'text',label:'Text'},
@@ -1114,17 +1111,14 @@ class Field_Logic {
 			{value:'list',label:'List'},
 		];
 	};
-	//static get_field_value_value = (value_type,item,value_id,group_id,title) =>{
-	static get_field_value_value = (value_type,item,value_id,title) =>{
-				return !Str.check_is_null(item[Field_Logic.get_field_value_title(value_type,value_id,title)]) ? item[Field_Logic.get_field_value_title(value_type,value_id,title)] : "" ? value_type != Type.FIELD_VALUE_LIST : "";
-	};
-	//static get_field_value_title = (value_type,value_id,title) =>{
-	static get_field_value_title = (value_type,value_id,group_id,title) =>{
-		if(!title){
-			title = '';
+	static get_field_value_value = (value_type,item,value_id) =>{
+		if(value_type!=Type.FIELD_VALUE_LIST){
+			return !Str.check_is_null(item[Field_Logic.get_field_value_title(value_type,value_id)]) ? item[Field_Logic.get_field_value_title(value_type,value_id)] : ""
 		}else{
-			title = "_"+Str.get_title_url(title);
+			return !Str.check_is_null(item[Field_Logic.get_field_value_title(value_type,value_id)]) ? item[Field_Logic.get_field_value_title(value_type,value_id)] : []
 		}
+	};
+	static get_field_value_title = (value_type,value_id) =>{
 		switch(value_type){
 			case Type.FIELD_VALUE_TEXT:
 				return 'text'+'_value_'+value_id;
@@ -1136,7 +1130,7 @@ class Field_Logic {
 				return 'image'+'_value_'+value_id;
 				break;
 			case Type.FIELD_VALUE_LIST:
-				return 'list'+'_value_'+value_id +'_group_' +group_id+title;
+				return 'list'+'_value_'+value_id;
 				break;
 			default:
 				return 'text'+'_value_'+value_id;
@@ -1196,6 +1190,21 @@ class Field_Logic {
 		}
 		return item;
 	}
+	static get_value_list_group(item,value_id,group_id){
+		let full_str = 'list_value_'+value_id+"_group_"+group_id;
+		let new_list = [];
+		Log.w(full_str,full_str);
+		let count = 0;
+		for(const prop in item){
+			let new_item = {};
+			if(prop.startsWith(full_str)){
+				count = count+1;
+				new_item[prop.replace(full_str+"_","")] = item[prop];
+				new_list.push(new_item);
+			}
+		}
+		return new_list;
+	}
 	static get_value_list(item,option){
 		for(let b=0;b<parseInt(option.value_count);b++){
 			if(option.get_blank == false){
@@ -1351,7 +1360,6 @@ class Field_Logic {
 
 		return option;
 	}
-
 }
 class DataType {
 	static APP='app_biz';

package/package.json

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

package/test.js

@@ -29,82 +29,6 @@ const biz9_config ={
 describe("connect", () => {
     it("_connect", () => {
         series([
-
-            function(call) {
-                let my_template = {
-                    title1: "About Us",
-                    title2: "aboout_link",
-                    title3: "Categories",
-                    title4: "category_link",
-                    title5: "Create Gigs",
-                    title6: "gigs_link",
-                    title7: "Home",
-                    title8: "home_link",
-                    title9: "Service",
-                    title10: "service_link",
-                    title11: "Faq",
-                    title12: "faq_link",
-                    title13: "Contact",
-                    title14: "contact_link"
-                };
-                /*
-                let my_template = {
-                    title1: "About Us",
-                    title2: "aboout_link",
-                    title3: "about_id",
-                    title4: "Create Gigs",
-                    title5: "gigs_link",
-                    title6: "gigs_id",
-                    title7: "Service",
-                    title8: "service_link",
-                    title9: "service_id",
-                    title10: "Contact",
-                    title11: "contact_link",
-                    title12: "contact_id"
-                };
-                */
-
-                value_count = 2;
-                let new_list = [];
-                let row_count = 1;
-                for(let a = 1; a < 90; a++){
-                    if(!Str.check_is_null(my_template['title'+row_count])){
-                        let item = {};
-                        item['value_1'] = my_template['title'+row_count];
-                        if(value_count >=2){
-                            item['value_2'] = my_template['title'+Number(row_count+1)];
-                        }
-                        if(value_count >=3){
-                            item['value_3'] = my_template['title'+Number(row_count+2)];
-                        }
-                        new_list.push(item);
-                        row_count = row_count + value_count;
-                    }else{
-                        break;
-                    }
-                }
-       /*--work
-       list_value_count = 2;
-       let title_row = 1;
-       let link_row = 2;
-       for(let a = 1; a < 900; a++){
-           if(!Str.check_is_null(my_template['title'+title_row])){
-                new_list.push(
-                {
-                    value_1:my_template['title'+title_row],
-                    value_2:my_template['title'+link_row]
-                });
-                title_row = title_row + list_value_count;
-                link_row = title_row + 1;
-           }else{
-               console.log('bbbbbbbbb');
-               break;
-            }
-       }
-       */
-
-                Log.w('cool',new_list);
-            },
             function(call) {
                 console.log('CONNECT-BASE-START');
                 let data_type = DataType.PRODUCT;