Merge branch 'main' into prod/festapp

Author: miakh

lib/RouterService.dart

@@ -105,7 +105,8 @@ class RouterService {
   static Future<bool> updateOccasionFromLink(LinkModel link) async {
     bool canContinue = true;
     var checkedObject = await SynchroService.getAppConfig(occasionLink: link.occasionLink, formLink: link.formLink);
-    RightsService.currentUserOccasion = checkedObject.user;
+    RightsService.currentOccasionUser = checkedObject.user;
+    RightsService.currentUnitUser = checkedObject.unitUser;
     RightsService.currentOccasion = checkedObject.occasionId;
     RightsService.currentLink = checkedObject.link;
     RightsService.isAdminField = checkedObject.isAdmin;

lib/dataModels/OccasionLinkModel.dart

@@ -5,6 +5,7 @@ class OccasionLinkModel {
   int? occasionId;
   String? link;
   OccasionUserModel? user;
+  OccasionUserModel? unitUser;
   bool? isAdmin = false;
   String? versionRecommended; // New field for version_recommended
 
@@ -13,9 +14,12 @@ class OccasionLinkModel {
   bool isNotFound() => code == 404;
 
   factory OccasionLinkModel.fromJson(Map<String, dynamic> json) {
+    var unitUser = json["unit_user"] != null ? OccasionUserModel.fromJson(json["unit_user"]) : null;
+    var occasionUser = json["occasion_user"] != null ? OccasionUserModel.fromJson(json["occasion_user"]) : null;
     return OccasionLinkModel(
       code: json["code"],
-      user: json["occasion_user"] != null ? OccasionUserModel.fromJson(json["occasion_user"]) : null,
+      unitUser: unitUser,
+      user: occasionUser,
       link: json["link"],
       occasionId: json["occasion"],
       isAdmin: json["is_admin"],
@@ -26,6 +30,7 @@ class OccasionLinkModel {
   OccasionLinkModel({
     this.code,
     this.user,
+    this.unitUser,
     this.link,
     this.occasionId,
     this.isAdmin,

lib/dataServices/AuthService.dart

@@ -80,8 +80,8 @@ class AuthService {
   static Future<UserInfoModel> getFullUserInfo() async {
     var user = UserInfoModel();
     user.occasionUser = await DbUsers.getOccasionUser(AuthService.currentUserId());
-    if(RightsService.currentUserOccasion?.role != null) {
-      user.roleString = await getRoleInfo(RightsService.currentUserOccasion!.role!);
+    if(RightsService.currentOccasionUser?.role != null) {
+      user.roleString = await getRoleInfo(RightsService.currentOccasionUser!.role!);
     }
     user.userGroups = await DbGroups.getUserGroups();
     var eUserGroup = user.userGroups!.firstWhereOrNull((g)=>g.type == null);

lib/dataServices/DbCompanions.dart

@@ -33,7 +33,7 @@ class DbCompanions {
     await _supabase.rpc("create_companion_in_organization", params: {
       'org': AppConfig.organization,
       'oc': RightsService.currentOccasion,
-      'usr': RightsService.currentUserOccasion!.user!,
+      'usr': RightsService.currentOccasionUser!.user!,
       'c_name': name,
     });
   }

lib/dataServices/DbUsers.dart

@@ -45,6 +45,17 @@ class DbUsers {
     return [];
   }
 
+  static Future<List<UserInfoModel>> getAllUsersBasicsForUnit() async {
+    var oc = RightsService.currentOccasion!;
+    var result = await _supabase.rpc("get_all_user_basics_from_occasion_unit",
+        params: {"oc": RightsService.currentOccasion!});
+    if(result["code"] == 200) {
+      var t = List<UserInfoModel>.from(result["data"].map((x) => UserInfoModel.fromJson(x)));
+      return t;
+    }
+    return [];
+  }
+
   static Future<void> updateUserInfo(OccasionUserModel data) async {
     await _supabase.rpc("update_user",
         params:

lib/dataServices/RightsService.dart

@@ -9,7 +9,8 @@ import 'package:supabase_flutter/supabase_flutter.dart';
 
 class RightsService{
   static final _supabase = Supabase.instance.client;
-  static OccasionUserModel? currentUserOccasion;
+  static OccasionUserModel? currentOccasionUser;
+  static OccasionUserModel? currentUnitUser;
   static int? currentOccasion;
   static String? currentLink;
   static bool? isAdminField;
@@ -57,22 +58,30 @@ class RightsService{
   }
 
   static bool canSignInOutUsersFromEvents() {
-    return currentUserOccasion?.isEditor??false;
+    return currentOccasionUser?.isEditor??false;
   }
 
   static bool isAdmin() {
     return isAdminField??false;
   }
 
   static bool isEditor() {
-    return currentUserOccasion?.isEditor??false;
+    return currentOccasionUser?.isEditor??false;
+  }
+
+  static bool isUnitEditor() {
+    return currentUnitUser?.isEditor??false;
   }
 
   static bool isManager() {
-    return currentUserOccasion?.isManager??false;
+    return currentOccasionUser?.isManager??false;
+  }
+
+  static bool isUnitManager() {
+    return currentUnitUser?.isManager??false;
   }
 
   static bool isApprover() {
-    return currentUserOccasion?.isApprover??false;
+    return currentOccasionUser?.isApprover??false;
   }
 }

lib/pages/AdministrationOccasion/UsersTab.dart

@@ -73,7 +73,7 @@ class _UsersTabState extends State<UsersTab> {
             areAllActionsEnabled: RightsService.canUpdateUsers),
         headerChildren: [
           DataGridAction(name: "Import".tr(), action: (SingleTableDataGrid p0, [_]) => _import(p0), isEnabled: RightsService.canUpdateUsers),
-          if(RightsService.isAdmin())
+          if(RightsService.isManager())
           DataGridAction(name: "Add existing".tr(), action: (SingleTableDataGrid p0, [_]) => _addExisting(p0)),
           DataGridAction(name: "Invite".tr(), action: (SingleTableDataGrid p0, [_]) => _invite(p0), isEnabled: RightsService.canUpdateUsers),
           DataGridAction(name: "Change password".tr(), action: (SingleTableDataGrid p0, [_]) => _setPassword(p0), isEnabled: RightsService.canUpdateUsers),
@@ -108,8 +108,8 @@ class _UsersTabState extends State<UsersTab> {
   }
 
   Future<void> _addExisting(SingleTableDataGrid dataGrid) async {
-    if (_allUsers == null) return;
-    var nonAdded = _allUsers!.where((u) => !_getCheckedUsers(dataGrid).any((cu) => cu.user == u.id)).toList();
+    var existing = await DbUsers.getAllUsersBasicsForUnit();
+    var nonAdded = existing.where((u) => !_allUsers!.any((cu) => cu.id == u.id)).toList();
     DialogHelper.chooseUser(context, (chosenUser) async {
       if (chosenUser != null) {
         await DbUsers.addUserToOccasion(chosenUser.id, RightsService.currentOccasion!);

scripts/database/eshop/get_report_for_occasion.sql

@@ -16,6 +16,7 @@ DECLARE
     canceled_orders INT;
     total_revenue NUMERIC;
     paid_revenue NUMERIC;
+    result_revenue NUMERIC;
     returned_revenue NUMERIC;
     remaining_balance NUMERIC;
 
@@ -82,6 +83,7 @@ BEGIN
 
     -- Calculate the remaining balance
     remaining_balance := total_revenue - paid_revenue;
+    result_revenue := paid_revenue + returned_revenue;
 
     -- Calculate the count of ordered products grouped by product type and product title,
     -- excluding orders with state 'storno' and 'ordered'
@@ -141,8 +143,9 @@ BEGIN
            product_type_section ||
            E'===========\n' ||
            E'Suma všech objednávek: ' || to_char(total_revenue, 'FM99999990.00') || E'\n' ||
-           E'Suma zaplacených částek: ' || to_char(paid_revenue, 'FM99999990.00') || E'\n' ||
+           E'Suma přijatých částek: ' || to_char(paid_revenue, 'FM99999990.00') || E'\n' ||
            E'Suma vrácených částek: ' || to_char(returned_revenue, 'FM99999990.00') || E'\n' ||
+           E'Výsledná částka: ' || to_char(result_revenue, 'FM99999990.00') || E'\n' ||
            E'Zbývající částka: ' || to_char(remaining_balance, 'FM99999990.00') || E'\n' ||
            E'===========';
 EXCEPTION

scripts/database/functions/get_app_config.sql

@@ -11,9 +11,11 @@ DECLARE
     occasionId bigint;
     is_open_bool BOOLEAN;
     occasion_user occasion_users%rowtype;
+    unit_user unit_users%rowtype;
     is_admin_bool BOOLEAN;
     occasion_link text;
     version_recommended text;
+    occasion_unit bigint;
 BEGIN
     -- Log the request details in log_app_config table
     INSERT INTO public.log_app_config (organization, platform)
@@ -55,7 +57,7 @@ BEGIN
     -- If no link or form_link is provided
     ELSE
         -- Get the default occasion from the organization
-        SELECT data->>'DEFAULT_OCCASION' INTO occasionId
+        SELECT (data->>'DEFAULT_OCCASION')::bigint INTO occasionId
         FROM organizations
         WHERE id = org_id;
 
@@ -98,13 +100,29 @@ BEGIN
     WHERE occasion = occasionId
       AND "user" = auth.uid();
 
+    -- Retrieve the unit ID from the occasions table
+    SELECT unit INTO occasion_unit
+    FROM occasions
+    WHERE id = occasionId;
+
+    -- Get the unit user record if it exists
+    SELECT * INTO unit_user
+    FROM unit_users
+    WHERE unit = occasion_unit
+      AND "user" = auth.uid();
+
     -- Check if the current user is an admin on the occasion
     is_admin_bool := get_is_admin_on_occasion(occasionId);
 
     -- If the occasion is not open, enforce access restrictions
     IF is_open_bool = FALSE THEN
         IF auth.uid() IS NULL OR (occasion_user IS NULL AND NOT is_admin_bool) THEN
-            RETURN json_build_object('code', 403, 'message', 'Access forbidden', 'link', occasion_link, 'version_recommended', version_recommended);
+            RETURN json_build_object(
+                'code', 403,
+                'message', 'Access forbidden',
+                'link', occasion_link,
+                'version_recommended', version_recommended
+            );
         END IF;
     END IF;
 
@@ -120,11 +138,20 @@ BEGIN
           AND "user" = auth.uid();
     END IF;
 
+    -- Retrieve unit_user again in case the user was added to the occasion and now belongs to a unit
+    IF unit_user IS NULL AND occasion_unit IS NOT NULL AND auth.uid() IS NOT NULL THEN
+        SELECT * INTO unit_user
+        FROM unit_users
+        WHERE unit = occasion_unit
+          AND "user" = auth.uid();
+    END IF;
+
     -- Return final response with all data and status code 200 at the end
     RETURN json_build_object(
         'code', 200,
         'is_admin', is_admin_bool,
         'occasion_user', COALESCE(row_to_json(occasion_user)::jsonb, NULL),
+        'unit_user', COALESCE(row_to_json(unit_user)::jsonb, NULL),
         'link', occasion_link,
         'occasion', occasionId,
         'version_recommended', version_recommended