Merge branch 'organization-feature' of https://github.com/ruxailab/RUXAILAB into organization-feature

Author: KarinePistili

functions/src/https/email.js

@@ -6,7 +6,6 @@ import * as path from "path";
 export const sendEmail = functions.onCall({
   handler: async (data) => {
     const content = data.data;
-    console.log(content);
 
     const transporter = nodemailer.createTransport({
       host: process.env.SMTP_HOST,
@@ -26,7 +25,9 @@ export const sendEmail = functions.onCall({
         .replace("{{site}}", process.env.SITE_URL)
         .replace("{{message}}", content.data.message)
         .replace(/{{testTitle}}/g, content.data.testTitle)
-        .replace(/{{adminEmail}}/g, content.data.adminEmail);
+        .replace(/{{testDescription}}/g, content.data.testDescription)
+        .replace(/{{adminEmail}}/g, content.data.adminEmail)
+        .replace(/{{adminName}}/g, content.data.adminName);
     }
     else if (content.template === 'passwordReset') {
       const actionCodeSettings = {

functions/src/templates/mails/invitations.html

@@ -22,8 +22,15 @@
           <p>{{message}}</p>
           <p>
             You have been invited to participate in the study:
+            <br>
             <strong>{{testTitle}}</strong>
           </p>
+          <p style="margin:0 0 15px 0; font-size:14px; color:#555;">
+            Organized by <strong>{{adminName}}</strong>
+          </p>
+          <p>
+            {{testDescription}}
+          </p>
           <p>
             Click the button below to access the platform and begin your participation:
           </p>
@@ -43,10 +50,7 @@
       <!-- Footer -->
       <tr>
         <td style="background:#f0f0f0; padding:20px; text-align:center; font-size:13px; color:#555; line-height:1.5;">
-          <p>Need help? Contact:</p>
-          <p>
-            <a href="mailto:{{adminEmail}}" style="color:#4CAF50; text-decoration:none;">{{adminEmail}}</a>
-          </p>
+          <p>Need help? Contact: <a href="mailto:{{adminEmail}}" style="color:#4CAF50; text-decoration:none;">{{adminEmail}}</a></p>
           <p style="margin-top:15px; font-size:12px; color:#999;">
             © 2025 RUXAILAB - All rights reserved.
           </p>

src/shared/views/CooperatorsView.vue

@@ -204,6 +204,7 @@ const showIntroView = computed(() => {
 // Computeds
 const dialog = computed(() => store.getters.getDialogLeaveStatus);
 const test = computed(() => store.getters.test);
+const userAuth = computed(() => store.getters.user);
 const users = computed(() => store.state.Users?.users || []);
 const cooperatorsEdit = computed(() => test.value?.cooperators ? [...test.value.cooperators] : []);
 const loading = computed(() => store.getters.loading);
@@ -239,7 +240,9 @@ const handleSendEmail = async (guest) => {
     data: {
       message: inviteMessages.value || '',
       testTitle: test.value.testTitle,
+      testDescription: test.value.testDescription,
       adminEmail: test.value.testAdmin.email,
+      adminName: userAuth.value.name || userAuth.value.email,
     }
   })
 }
@@ -307,19 +310,19 @@ const submit = async () => {
   const coops = cooperatorsEdit.value.map((coop) => new Cooperators({...coop, userDocId: coop.userDocId || coop.id}))
   test.value.cooperators = [...coops]
 
-  try {
-    await store.dispatch('updateStudy', test.value);
-    await store.dispatch('getStudy', { id: test.value.id });
-  } catch (error) {
-    console.error('Error updating study:', error);
-  }
-
   const newCooperators = cooperatorsEdit.value.filter(
     (guest) => !cooperatorsUpdate.value.some((c) => c.email === guest.email)
   );
 
-  for (const guest of newCooperators) {
-    await sendMenssages(guest);
+  try {
+    await store.dispatch('updateStudy', test.value);
+
+    await Promise.all([
+      store.dispatch('getStudy', { id: test.value.id }),
+      ...newCooperators.map(guest => sendMenssages(guest))
+    ]);
+  } catch (error) {
+    console.error('Error updating study:', error);
   }
 };
 

src/ux/UserTest/components/manager/ModeratorActions.vue

@@ -0,0 +1,159 @@
+<template>
+  <v-card class="h-100">
+    <v-card-title class="d-flex align-center pb-2">
+      <v-icon class="mr-2" color="primary">mdi-account-supervisor</v-icon>
+      Moderator Actions
+    </v-card-title>
+    
+    <v-card-text class="pa-4">
+      <div class="d-flex flex-column gap-3">
+        <v-btn
+          color="primary"
+          variant="outlined"
+          block
+          @click="startSession"
+        >
+          <v-icon start>mdi-play</v-icon>
+          Start Session
+        </v-btn>
+        
+        <v-btn
+          color="success"
+          variant="outlined"
+          block
+          @click="scheduleSession"
+        >
+          <v-icon start>mdi-calendar-plus</v-icon>
+          Schedule Session
+        </v-btn>
+        
+        <v-btn
+          color="info"
+          variant="outlined"
+          block
+          @click="viewSessions"
+        >
+          <v-icon start>mdi-calendar-check</v-icon>
+          View Sessions
+        </v-btn>
+        
+        <v-btn
+          color="warning"
+          variant="outlined"
+          block
+          @click="editTest"
+        >
+          <v-icon start>mdi-pencil</v-icon>
+          Edit Test
+        </v-btn>
+        
+        <v-btn
+          color="orange"
+          variant="outlined"
+          block
+          @click="moderatorGuide"
+        >
+          <v-icon start>mdi-book-open-variant</v-icon>
+          Moderator Guide
+        </v-btn>
+        
+        <v-btn
+          v-if="test.status === 'active'"
+          color="error"
+          variant="outlined"
+          block
+          @click="pauseTest"
+        >
+          <v-icon start>mdi-pause</v-icon>
+          Pause Test
+        </v-btn>
+        
+        <v-btn
+          v-else-if="test.status === 'paused'"
+          color="success"
+          variant="outlined"
+          block
+          @click="resumeTest"
+        >
+          <v-icon start>mdi-play</v-icon>
+          Resume Test
+        </v-btn>
+      </div>
+    </v-card-text>
+  </v-card>
+</template>
+
+<script setup>
+import { useRouter } from 'vue-router'
+import { useStore } from 'vuex'
+
+const props = defineProps({
+  test: {
+    type: Object,
+    default: () => ({})
+  }
+})
+
+const router = useRouter()
+const store = useStore()
+
+const startSession = () => {
+  router.push(`/userTest/moderated/session/${props.test.id}`)
+}
+
+const scheduleSession = () => {
+  router.push(`/userTest/moderated/schedule/${props.test.id}`)
+}
+
+const viewSessions = () => {
+  router.push(`/userTest/moderated/sessions/${props.test.id}`)
+}
+
+const editTest = () => {
+  router.push(`/userTest/moderated/edit/${props.test.id}`)
+}
+
+const moderatorGuide = () => {
+  // Open moderator guide or help documentation
+  store.commit('SET_TOAST', { 
+    type: 'info', 
+    message: 'Moderator guide will be available soon!' 
+  })
+}
+
+const pauseTest = async () => {
+  try {
+    await store.dispatch('updateTestStatus', {
+      testId: props.test.id,
+      status: 'paused'
+    })
+    store.commit('SET_TOAST', { 
+      type: 'success', 
+      message: 'Test paused successfully' 
+    })
+  } catch (error) {
+    store.commit('SET_TOAST', { 
+      type: 'error', 
+      message: 'Failed to pause test' 
+    })
+  }
+}
+
+const resumeTest = async () => {
+  try {
+    await store.dispatch('updateTestStatus', {
+      testId: props.test.id,
+      status: 'active'
+    })
+    store.commit('SET_TOAST', { 
+      type: 'success', 
+      message: 'Test resumed successfully' 
+    })
+  } catch (error) {
+    store.commit('SET_TOAST', { 
+      type: 'error', 
+      message: 'Failed to resume test' 
+    })
+  }
+}
+</script>