mr.mojtaba/rasadyar_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat : role And permission

Browse Source
This commit is contained in:
mr.mojtaba
2025-09-06 14:50:02 +03:30
parent bdf5344451
commit 34609d22a1
34 changed files with 657 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
packages/chicken/lib/data/common/fa_user_role.dart
View File

@@ -1,3 +1,5 @@
import 'package:rasadyar_chicken/presentation/routes/routes.dart';
String getFaUserRole(String? role) {
switch (role) {
case "Admin":
@@ -76,3 +78,83 @@ String getFaUserRole(String? role) {
return "نامشخص";
}
}
Map<String, String?> getFaUserRoleWithOnTap(String? role) {
switch (role) {
case "Admin":
return {"ادمین استان": null};
case "CityOperator":
return {"تعاونی": null};
case "Poultry":
return {"مرغدار": null};
case "ProvinceOperator":
return {"مدیر اجرایی": null};
case "ProvinceFinancial":
return {"مالی اتحادیه": null};
case "KillHouse":
return {"کشتارگاه": null};
case "KillHouseVet":
return {"دامپزشک کشتارگاه": null};
case "VetFarm":
return {"دامپزشک فارم": null};
case "Driver":
return {"راننده": null};
case "ProvinceInspector":
return {"بازرس اتحادیه": null};
case "VetSupervisor":
return {"دامپزشک کل": null};
case "Jahad":
return {"جهاد کشاورزی استان": null};
case "CityJahad":
return {"جهاد کشاورزی شهرستان": null};
case "ProvincialGovernment":
return {"استانداری": null};
case "Guilds":
return {"صنف": null};
case "Commerce":
return {"معاونت بازرگانی استان": null};
case "CityCommerce":
return {"بازرگانی شهرستان": null};
case "UnitWindow":
return {"پنجره واحد": null};
case "CityVet":
return {"دامپزشک شهرستان": null};
case "Observatory":
return {"رصدخانه": null};
case "ProvinceSupervisor":
return {"ناظر استان": null};
case "GuildRoom":
return {"اتاق اصناف": null};
case "PosCompany":
return {"شرکت psp": null};
case "LiveStockSupport":
return {"پشتیبانی امور دام": null};
case "SuperAdmin":
return {"ادمین کل": null};
case "ChainCompany":
return {"شرکت زنجیره": null};
case "AdminX":
return {"ادمین ایکس": null};
case "Supporter":
return {"پشتیبان سامانه": null};
case "Dispenser":
return {"پخش کننده": null};
case "CityPoultry":
return {"طیور شهرستان": null};
case "ParentCompany":
return {"شرکت مادر": null};
case "ColdHouseSteward":
return {"مباشر سردخانه": null};
case "CityGuild":
return {"اتحادیه پروتئینی": null};
case "LiveStockProvinceJahad":
return {"جهاد استان": null};
case "Steward":
return {"مباشر": ChickenRoutes.initSteward};
case "PoultryScience":
return {"کارشناس طیور": ChickenRoutes.initPoultryScience
};
default:
return {"نامشخص": null};
}
}

14
packages/chicken/lib/data/di/chicken_di.dart
View File

@@ -15,7 +15,11 @@ import 'package:rasadyar_core/core.dart';
GetIt diChicken = GetIt.asNewInstance();
Future<void> setupChickenDI() async {
if (diChicken.isRegistered<DioErrorHandler>()) {
await diChicken.unregister<DioErrorHandler>();
}
diChicken.registerSingleton(DioErrorHandler());
var tokenService = Get.find<TokenStorageService>();
diChicken.registerLazySingleton<AppInterceptor>(
@@ -23,10 +27,10 @@ Future<void> setupChickenDI() async {
// سامانه مرغ فعلاً رفرش توکن ندارد
refreshTokenCallback: () async => null,
saveTokenCallback: (String newToken) async {
await tokenService.saveAccessToken(newToken);
await tokenService.saveAccessToken(Module.chicken, newToken);
},
clearTokenCallback: () async {
await tokenService.deleteTokens();
await tokenService.deleteAllTokens();
Get.offAllNamed(ChickenRoutes.auth, arguments: Module.chicken);
},
),
@@ -69,7 +73,7 @@ Future<void> newSetupAuthDI(String newUrl) async {
var tokenService = Get.find<TokenStorageService>();
// همیشه baseUrl جدید رو ذخیره کن
await tokenService.saveBaseUrl(newUrl);
await tokenService.saveBaseUrl(Module.chicken, newUrl);
// Re-register AppInterceptor
if (diChicken.isRegistered<AppInterceptor>(instanceName: 'chickenInterceptor')) {
@@ -79,10 +83,10 @@ Future<void> newSetupAuthDI(String newUrl) async {
() => AppInterceptor(
refreshTokenCallback: () async => null,
saveTokenCallback: (String newToken) async {
await tokenService.saveAccessToken(newToken);
// await tokenService.saveAccessToken(newToken);
},
clearTokenCallback: () async {
await tokenService.deleteTokens();
await tokenService.deleteAllTokens();
Get.offAllNamed(ChickenRoutes.auth, arguments: Module.chicken);
},
),

8
packages/chicken/lib/data/service/chicken_storage_service.dart Normal file
View File

@@ -0,0 +1,8 @@
import 'package:rasadyar_core/core.dart';
class ChickenStorageService extends GetxService {
}

65
packages/chicken/lib/presentation/pages/auth/logic.dart
View File

@@ -1,12 +1,12 @@
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:rasadyar_chicken/chicken.dart';
import 'package:rasadyar_chicken/data/common/dio_error_handler.dart';
import 'package:rasadyar_chicken/data/di/chicken_di.dart';
import 'package:rasadyar_chicken/data/models/response/user_info/user_info_model.dart';
import 'package:rasadyar_chicken/data/models/response/user_profile_model/user_profile_model.dart';
import 'package:rasadyar_chicken/data/repositories/auth/auth_repository.dart';
import 'package:rasadyar_chicken/presentation/routes/routes.dart';
import 'package:rasadyar_chicken/presentation/widget/captcha/logic.dart';
import 'package:rasadyar_core/core.dart';
@@ -18,7 +18,6 @@ enum OtpStatus { init, sent, verified, reSend }
class AuthLogic extends GetxController with GetTickerProviderStateMixin {
GlobalKey<FormState> formKey = GlobalKey<FormState>();
late AnimationController _textAnimationController;
late Animation<double> textAnimation;
RxBool showCard = false.obs;
@@ -36,6 +35,8 @@ class AuthLogic extends GetxController with GetTickerProviderStateMixin {
RxnString phoneNumber = RxnString(null);
RxBool isLoading = false.obs;
RxBool isDisabled = true.obs;
GService gService = Get.find<GService>();
TokenStorageService tokenStorageService = Get.find<TokenStorageService>();
Rx<AuthType> authType = AuthType.useAndPass.obs;
@@ -54,21 +55,16 @@ class AuthLogic extends GetxController with GetTickerProviderStateMixin {
super.onInit();
_textAnimationController =
AnimationController(vsync: this, duration: const Duration(milliseconds: 1200))
..repeat(reverse: true, count: 2).whenComplete(() {
showCard.value = true;
});
AnimationController(vsync: this, duration: const Duration(milliseconds: 1200))
..repeat(reverse: true, count: 2).whenComplete(() {
showCard.value = true;
});
textAnimation = CurvedAnimation(parent: _textAnimationController, curve: Curves.easeInOut);
initUserPassData();
}
@override
void onReady() {
super.onReady();
}
@override
void onClose() {
_textAnimationController.dispose();
@@ -110,27 +106,36 @@ class AuthLogic extends GetxController with GetTickerProviderStateMixin {
AuthRepository authTmp = diChicken.get<AuthRepository>();
isLoading.value = true;
await safeCall<UserProfileModel?>(
call: () => authTmp.login(
authRequest: {
"username": usernameController.value.text,
"password": passwordController.value.text,
},
),
call: () =>
authTmp.login(
authRequest: {
"username": usernameController.value.text,
"password": passwordController.value.text,
},
),
onSuccess: (result) async {
await gService.saveSelectedModule(_module);
await tokenStorageService.saveModule(_module);
await tokenStorageService.saveAccessToken(result?.accessToken ?? '');
await tokenStorageService.saveRefreshToken(result?.accessToken ?? '');
await tokenStorageService.saveAccessToken(_module, result?.accessToken ?? '');
await tokenStorageService.saveRefreshToken(_module, result?.accessToken ?? '');
var tmpRoles = result?.role
?.where((element) => element == 'PoultryScience' || element == 'Steward')
.toList();
await tokenStorageService.saveRoles(_module, tmpRoles ?? []);
if (rememberMe.value) {
await tokenStorageService.saveUserPass(
UserLocalModel(
username: usernameController.value.text,
password: passwordController.value.text,
module: _module,
),
_module,
usernameController.value.text,
passwordController.value.text,
);
}
Get.offAndToNamed(ChickenRoutes.role);
if (tmpRoles!.length > 1) {
Get.offAndToNamed(ChickenRoutes.role);
} else {
Get.offAllNamed(ChickenRoutes.initSteward);
}
},
onError: (error, stackTrace) {
if (error is DioException) {
@@ -149,8 +154,6 @@ class AuthLogic extends GetxController with GetTickerProviderStateMixin {
onSuccess: (result) async {
if (result != null) {
await newSetupAuthDI(result.backend ?? '');
await tokenStorageService.saveApiKey(result.apiKey ?? '');
await tokenStorageService.saveBaseUrl(result.backend ?? '');
}
},
onError: (error, stackTrace) {
@@ -164,10 +167,10 @@ class AuthLogic extends GetxController with GetTickerProviderStateMixin {
}
void initUserPassData() {
UserLocalModel? userPass = tokenStorageService.getUserPass(_module);
if (userPass != null) {
usernameController.value.text = userPass.username ?? '';
passwordController.value.text = userPass.password ?? '';
UserLocalModel? userLocalModel = tokenStorageService.getUserLocal(Module.chicken);
if (userLocalModel?.username != null && userLocalModel?.password != null) {
usernameController.value.text = userLocalModel?.username ?? '';
passwordController.value.text = userLocalModel?.password ?? '';
rememberMe.value = true;
}
}

15
packages/chicken/lib/presentation/pages/role/logic.dart
View File

@@ -1,8 +1,19 @@
import 'package:rasadyar_core/core.dart';
class RoleLogic extends GetxController {
TokenStorageService tokenService = Get.find<TokenStorageService>();
GService gService = Get.find<GService>();
RxList<String> roles = <String>[].obs;
@override
void onInit() {
super.onInit();
List<String> items = tokenService.getUserLocal(Module.chicken)!.roles ?? [];
if (items.isNotEmpty ?? false) {
roles.assignAll(items);
}
}
@override
void onReady() {
// TODO: implement onReady

79
packages/chicken/lib/presentation/pages/role/view.dart
View File

@@ -1,6 +1,6 @@
import 'dart:ui';
import 'package:flutter/material.dart';
import 'package:rasadyar_chicken/data/common/fa_user_role.dart';
import 'package:rasadyar_chicken/presentation/widget/base_page/view.dart';
import 'package:rasadyar_core/core.dart';
import 'logic.dart';
@@ -10,7 +10,42 @@ class RolePage extends GetView<RoleLogic> {
@override
Widget build(BuildContext context) {
return Scaffold(
return BasePage(
hasSearch: true,
hasBack: false,
isBase: true,
routes: ['انتخاب نقش'],
widgets: [
ObxValue((data) {
return Expanded(
child: GridView.builder(
physics: BouncingScrollPhysics(),
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 3,
mainAxisSpacing: 12.h,
crossAxisSpacing: 12.w,
childAspectRatio: 2,
),
itemCount: data.length,
hitTestBehavior: HitTestBehavior.opaque,
itemBuilder: (BuildContext context, int index) {
Map role = getFaUserRoleWithOnTap(data[index]);
return roleCard(
title: role.keys.first,
onTap: () async {
String route = role.values.first;
await controller.gService.saveSelectedRole(route);
Get.offAllNamed(route);
},
);
},
),
);
}, controller.roles),
],
);
/* return Scaffold(
body: Stack(
alignment: Alignment.center,
children: [
@@ -32,33 +67,37 @@ class RolePage extends GetView<RoleLogic> {
'انتخاب نقش',
style: AppFonts.yekan20Bold.copyWith(color: AppColor.textColor),
),
Expanded(
child: GridView.builder(
physics: BouncingScrollPhysics(),
gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent(
maxCrossAxisExtent: 250,
mainAxisSpacing: 12,
crossAxisSpacing: 12,
childAspectRatio: 1.5,
ObxValue((data) {
return Expanded(
child: GridView.builder(
physics: BouncingScrollPhysics(),
gridDelegate: SliverGridDelegateWithMaxCrossAxisExtent(
maxCrossAxisExtent: 250,
mainAxisSpacing: 12,
crossAxisSpacing: 12,
childAspectRatio: 1.5,
),
itemCount: data.length,
hitTestBehavior: HitTestBehavior.opaque,
itemBuilder: (BuildContext context, int index) {
return roleCard(title: getFaUserRole(data[index]), onTap: () {});
},
),
itemCount: 3,
hitTestBehavior: HitTestBehavior.opaque,
itemBuilder: (BuildContext context, int index) {
return roleCard(title: index == 0 ? 'نasdsadasdقش $index' : "wlsp", onTap: null);
},
),
),
);
}, controller.roles),
],
),
),
),
],
),
);
);*/
}
Widget roleCard({required String title, Function()? onTap}) {
return Container(
width: 128.w,
height: 48.h,
margin: EdgeInsets.all(8.w),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8.r),
@@ -67,7 +106,7 @@ class RolePage extends GetView<RoleLogic> {
child: InkWell(
onTap: onTap,
child: Center(
child: Text(title, style: AppFonts.yekan16Bold.copyWith(color: AppColor.blueNormal)),
child: Text(title, style: AppFonts.yekan12Bold.copyWith(color: AppColor.blueNormal)),
),
),
);

2
packages/chicken/lib/presentation/pages/steward/profile/view.dart
View File

@@ -613,7 +613,7 @@ class ProfilePage extends GetView<ProfileLogic> {
text: 'خروج',
backgroundColor: AppColor.error,
onPressed: () async {
await controller.rootLogic.tokenService.deleteTokens().then((value){
await controller.rootLogic.tokenService.deleteAllTokens().then((value){
Get.back();
Get.offAllNamed(ChickenRoutes.auth, arguments: Module.chicken);
});

9
packages/chicken/lib/presentation/pages/steward/root/logic.dart
View File

@@ -2,15 +2,12 @@ import 'dart:async';
import 'package:flutter/widgets.dart';
import 'package:rasadyar_chicken/data/data_source/local/chicken_local.dart';
import 'package:rasadyar_chicken/data/data_source/local/chicken_local_imp.dart';
import 'package:rasadyar_chicken/data/di/chicken_di.dart';
import 'package:rasadyar_chicken/data/models/local/widely_used_local_model.dart';
import 'package:rasadyar_chicken/data/models/response/inventory/inventory_model.dart';
import 'package:rasadyar_chicken/data/models/response/iran_province_city/iran_province_city_model.dart';
import 'package:rasadyar_chicken/data/models/response/roles_products/roles_products.dart';
import 'package:rasadyar_chicken/data/repositories/chicken/chicken_repository.dart';
import 'package:rasadyar_chicken/data/repositories/chicken/chicken_repository_imp.dart';
import 'package:rasadyar_chicken/presentation/pages/steward/buy/view.dart';
import 'package:rasadyar_chicken/presentation/pages/steward/home/view.dart';
import 'package:rasadyar_chicken/presentation/pages/steward/profile/view.dart';
@@ -53,8 +50,6 @@ class StewardRootLogic extends GetxController {
/*localDatasource.openBox().then((value) async {
widelyUsedList.value = localDatasource.getAllWidely();
});*/
}
@override
@@ -72,6 +67,7 @@ class StewardRootLogic extends GetxController {
}
if (widelyUsedList.value?.hasInit != true) {
//TODO
localDatasource.initWidleyUsed().then((value) => localDatasource.getAllWidely());
}
}
@@ -118,7 +114,7 @@ class StewardRootLogic extends GetxController {
void rootErrorHandler(DioException error) {
handleGeneric(error, () {
tokenService.deleteTokens();
tokenService.deleteAllTokens();
});
}
@@ -158,5 +154,4 @@ class StewardRootLogic extends GetxController {
onError: (error, stacktrace) {},
);
}
}