Merge branch 'main' into prod/festapp

vkh-cr · Nov 2, 2024 · b46f01b · b46f01b
2 parents d47c8dd + 5abc285
commit b46f01b
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 15 deletions.
diff --git a/lib/pages/HtmlEditorPage.dart b/lib/pages/HtmlEditorPage.dart
@@ -165,14 +165,14 @@ class _HtmlEditorPageState extends State<HtmlEditorPage> {
                   text: "Storno".tr(),
                   onPressed: _isSaving ? null : cancelPressed,
                 ),
-                ButtonsHelper.bottomBarButton(
-                  text: "Process and Save".tr(),
-                  onPressed: _isSaving ? null : savePressed,
-                ),
                 ButtonsHelper.bottomBarButton(
                   text: "Save".tr(),
-                  onPressed: _isSaving ? null : saveRawPressed, // Save Raw button
+                  onPressed: _isSaving ? null : savePressed,
                 ),
+                // ButtonsHelper.bottomBarButton(
+                //   text: "Save".tr(),
+                //   onPressed: _isSaving ? null : saveRawPressed, // Save Raw button
+                // ),
               ],
               ),
             ),
@@ -185,8 +185,8 @@ class _HtmlEditorPageState extends State<HtmlEditorPage> {
 
   Future<void> savePressed() async {
     String? htmlTextEdited = await controller.getText();
-    var htmlText = HtmlHelper.removeBackgroundColor(htmlTextEdited);
-    htmlText = HtmlHelper.detectAndReplaceLinks(htmlTextEdited);
+    var htmlText = HtmlHelper.removeColor(htmlTextEdited);
+    htmlText = HtmlHelper.detectAndReplaceLinks(htmlText);
 
     setState(() {
       _isSaving = true;

diff --git a/lib/pages/NewsFormPage.dart b/lib/pages/NewsFormPage.dart
@@ -55,7 +55,7 @@ class _NewsFormPageState extends State<NewsFormPage> {
 
   Future<void> _sendPressed({bool isTest = false, bool process = false}) async {
     var htmlContent = await _controller.getText();
-    htmlContent = HtmlHelper.removeBackgroundColor(htmlContent);
+    htmlContent = HtmlHelper.removeColor(htmlContent);
     if (process == true) {
       htmlContent = HtmlHelper.detectAndReplaceLinks(htmlContent);
     }
@@ -76,7 +76,7 @@ class _NewsFormPageState extends State<NewsFormPage> {
   }
 
   Future<void> _processAndSendPressed() async {
-    _sendPressed(process: true);
+    _sendPressed(isTest: true, process: true);
   }
 
   @override
@@ -142,10 +142,10 @@ class _NewsFormPageState extends State<NewsFormPage> {
                   ),
                   ButtonsHelper.bottomBarButton(
                     onPressed: _processAndSendPressed,
-                    text: "Process and Send".tr(),
+                    text: "Test",
                   ),
                   ButtonsHelper.bottomBarButton(
-                    onPressed: () => _sendPressed(),
+                    onPressed: () => _sendPressed(process: true),
                     text: "Send".tr(),
                   ),
                 ],

diff --git a/lib/services/HtmlHelper.dart b/lib/services/HtmlHelper.dart
@@ -84,8 +84,8 @@ class HtmlHelper {
     return document.outerHtml;
   }
 
-  static String removeBackgroundColor(String htmlText) {
-    RegExp regExp = RegExp(r'background-color\s*:\s*[^;]+;?\s*', caseSensitive: false);
+  static String removeColor(String htmlText) {
+    RegExp regExp = RegExp(r'(background-color|color)\s*:\s*[^;]+;?\s*', caseSensitive: false);
     String cleanedHtmlString = htmlText.replaceAll(regExp, '');
     return cleanedHtmlString;
   }

diff --git a/lib/themeConfig.dart b/lib/themeConfig.dart
@@ -87,7 +87,7 @@ class ThemeConfig {
   static Color timetableTimeLineColor(BuildContext context) => appBarColor();
   static Color timetableSelectedColor(BuildContext context, Color color) => isDarkMode(context) ?
       color.changeColorSaturation(0.7).changeColorLightness(0.8) :
-      color.changeColorSaturation(0.6).changeColorLightness(0.6)
+      color.changeColorSaturation(0.5).changeColorLightness(0.6)
   ;
   static Color timetableUnselectedColor(BuildContext context, Color color) => isDarkMode(context) ?
       color.changeColorSaturation(0.1).changeColorLightness(0.3) :

diff --git a/scripts/database/users/add_user_to_occasion.sql b/scripts/database/users/add_user_to_occasion.sql
@@ -7,7 +7,24 @@ DECLARE
     occasion_open BOOLEAN;
     user_data JSONB;
     user_exists BOOLEAN;
+    user_org BIGINT;
+    occasion_org BIGINT;
 BEGIN
+    -- Get the organization ID of the occasion
+    SELECT organization INTO occasion_org
+    FROM occasions
+    WHERE id = oc;
+
+    -- Get the organization ID of the user
+    SELECT organization INTO user_org
+    FROM user_info
+    WHERE id = usr;
+
+    -- Check if the user and occasion belong to the same organization
+    IF user_org IS DISTINCT FROM occasion_org THEN
+        RETURN jsonb_build_object('code', 403, 'message', 'User does not belong to the same organization as the occasion');
+    END IF;
+
     -- Check if the occasion is open
     SELECT is_open INTO occasion_open
     FROM occasions
@@ -72,4 +89,4 @@ BEGIN
     -- Return success code
     RETURN jsonb_build_object('code', 200);
 END;
-$$;
+$$;