biz9-logic 4.8.354 → 4.8.356

package/biz9_config

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

package/index.js

@@ -209,17 +209,15 @@ class Type {
 	static PAGE_PRODUCT_DETAIL='product_detail';
 	static PAGE_SERVICE='service';
 	static PAGE_SERVICE_DETAIL='service_detail';
-
 	//stat
 	static STAT_VIEW='view_post';
+	static STAT_LOGIN='login_post';
+	static STAT_REGISTER='register_post';
 	static STAT_LIKE='like_post';
 	static STAT_FAVORITE='favorite_post';
 	static STAT_CART='cart_post';
 	static STAT_ORDER='order_post';
 	static STAT_REVIEW='review_post';
-	static STAT_LOGIN='login_post';
-	static STAT_REGISTER='register_post';
-
 	//template
 	static TEMPLATE_PRIMARY='primary';
 	static TEMPLATE_HEADER='header';
@@ -351,32 +349,39 @@ class Type {
 			case DataType.USER:
 			case DataType.VIDEO:
 			r_type = String(Str.get_title(type.replaceAll('_',' ').replaceAll('dt','').replace('biz',''))).trim();
-				console.log(r_type);
-				console.log('11111111');
 			break;
 			default:
 				r_type = "N/A";
 				break;
 		}
-			console.log(type);
-			console.log('aaaaa');
-			console.log(r_type);
 			if(option.get_plural){
-				console.log('bbbbbbbb');
 				r_type = r_type + 's';
 			}
 			if(option.get_lowercase){
-				console.log('cccccccc');
 				r_type = r_type.toLowerCase();
 			}
 			if(option.get_url){
-				console.log('dddddddd');
 				r_type = r_type.replace(" ","_").toLowerCase();
 			}
 			return r_type;
 	}
 }
 class Stat_Logic {
+	static get_all_activity = () =>{
+		return {
+			$or: [
+				{ type: { $regex:String(Type.STAT_LOGIN), $options: "i" } },
+				{ type: { $regex:String(Type.STAT_REGISTER), $options: "i" } },
+			] };
+	}
+	static get_user_activity = (user_id) =>{
+		return {
+			   $and: [
+        { $or: [ { type: Type.STAT_LOGIN }, { type: Type.STAT_REGISTER } ] },
+        { user_id: user_id }
+    			]
+		}
+	}
 	static url_search_activity = (app_id,url,param) => {
 		let action_url="item/search_activity";
 		return get_cloud_url_main(app_id,url,action_url,param);
@@ -1339,42 +1344,6 @@ class Category_Logic {
 			{data_type:Type.PAGE_PRODUCT,value:DataType.PRODUCT,label:Title.PAGE_PRODUCT},
 		];
 	};
-	static get_title_by_type = (type) => {
-		switch (ype) {
-			case DataType.BLOG_POST:
-				return Title.DATA_TYPE_BLOG_POST;
-				break;
-			case DataType.CATEGORY:
-				return Title.DATA_TYPE_CATEGORY;
-				break;
-			case DataType.CONTENT:
-				return Title.DATA_TYPE_CONTENT;
-				break;
-			case DataType.EVENT:
-				return Title.DATA_TYPE_EVENT;
-				break;
-			case DataType.GALLERY:
-				return Title.DATA_TYPE_GALLERY;
-				break;
-			case DataType.USER:
-				return Title.ROLE_USER;
-				break;
-			case DataType.PAGE:
-				return Title.DATA_TYPE_PAGE;
-				break;
-			case DataType.PRODUCT:
-				return Title.DATA_TYPE_PRODUCT;
-				break;
-			case DataType.SERVICE:
-				return Title.DATA_TYPE_SERVICE;
-				break;
-			case DataType.TEMPLATE:
-				return Title.DATA_TYPE_TEMPLATE;
-				break;
-			default:
-				return "Blank";
-		}
-	}
 };
 class Storage {
 	static get = (window,key) => {
@@ -1637,39 +1606,39 @@ class Image_Logic {
 			},
 			{
 				image_filename:Type.IMAGE_SIZE_THUMB+"_"+image_filename,
-				path_filename:upload_dir+"/"+Image_Logic.Type.IMAGE_SIZE_THUMB+"_"+image_filename,
+				path_filename:upload_dir+"/"+Type.IMAGE_SIZE_THUMB+"_"+image_filename,
 				size:250,
-				type_resize:Image_Logic.Type.IMAGE_RESIZE_NORMAL,
+				type_resize:Type.IMAGE_RESIZE_NORMAL,
 			},
 			{
-				image_filename:Image_Logic.Type.IMAGE_SIZE_MID+"_"+image_filename,
-				path_filename:upload_dir+"/"+Image_Logic.Type.IMAGE_SIZE_MID+"_"+image_filename,
+				image_filename:Type.IMAGE_SIZE_MID+"_"+image_filename,
+				path_filename:upload_dir+"/"+Type.IMAGE_SIZE_MID+"_"+image_filename,
 				size:720,
-				type_resize:Image_Logic.Type.IMAGE_RESIZE_NORMAL,
+				type_resize:Type.IMAGE_RESIZE_NORMAL,
 			},
 			{
-				image_filename:Image_Logic.Type.IMAGE_SIZE_LARGE+"_"+image_filename,
-				path_filename:upload_dir+"/"+Image_Logic.Type.IMAGE_SIZE_LARGE+"_"+image_filename,
+				image_filename:Type.IMAGE_SIZE_LARGE+"_"+image_filename,
+				path_filename:upload_dir+"/"+Type.IMAGE_SIZE_LARGE+"_"+image_filename,
 				size:1000,
-				type_resize:Image_Logic.Type.IMAGE_RESIZE_NORMAL,
+				type_resize:Type.IMAGE_RESIZE_NORMAL,
 			},
 			{
-				image_filename:Image_Logic.Type.IMAGE_SIZE_SQUARE_THUMB+"_"+image_filename,
-				path_filename:upload_dir+"/"+Image_Logic.Type.IMAGE_SIZE_SQUARE_THUMB+"_"+image_filename,
+				image_filename:Type.IMAGE_SIZE_SQUARE_THUMB+"_"+image_filename,
+				path_filename:upload_dir+"/"+Type.IMAGE_SIZE_SQUARE_THUMB+"_"+image_filename,
 				size:250,
-				type_resize:Image_Logic.Type.IMAGE_RESIZE_SQUARE,
+				type_resize:Type.IMAGE_RESIZE_SQUARE,
 			},
 			{
-				image_filename:Image_Logic.Type.IMAGE_SIZE_SQUARE_MID+"_"+image_filename,
-				path_filename:upload_dir+"/"+Image_Logic.Type.IMAGE_SIZE_SQUARE_MID+"_"+image_filename,
+				image_filename:Type.IMAGE_SIZE_SQUARE_MID+"_"+image_filename,
+				path_filename:upload_dir+"/"+Type.IMAGE_SIZE_SQUARE_MID+"_"+image_filename,
 				size:720,
-				type_resize:Image_Logic.Type.IMAGE_RESIZE_SQUARE,
+				type_resize:Type.IMAGE_RESIZE_SQUARE,
 			},
 			{
-				image_filename:Image_Logic.Type.IMAGE_SIZE_SQUARE_LARGE+"_"+image_filename,
-				path_filename:upload_dir+"/"+Image_Logic.Type.IMAGE_SIZE_SQUARE_LARGE+"_"+image_filename,
+				image_filename:Type.IMAGE_SIZE_SQUARE_LARGE+"_"+image_filename,
+				path_filename:upload_dir+"/"+Type.IMAGE_SIZE_SQUARE_LARGE+"_"+image_filename,
 				size:1000,
-				type_resize:Image_Logic.Type.IMAGE_RESIZE_SQUARE,
+				type_resize:Type.IMAGE_RESIZE_SQUARE,
 			},
 		];
 	}

package/package.json

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