Merge pull request #515 from yeatmanlab/enh/enable-email

Allow email column to be selected in mass uploader
yeatmanlab · Apr 19, 2024 · 44c894e · 44c894e
2 parents 97ada88 + e715e06
commit 44c894e
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 5 deletions.
diff --git a/src/components/CreateAdministration.vue b/src/components/CreateAdministration.vue
@@ -271,12 +271,14 @@ const submit = async () => {
 
       const orgsValid = checkForRequiredOrgs(orgs);
       if (orgsValid) {
+        const dateClose = new Date(state.dates[1]);
+        dateClose.setHours(23, 59, 59, 999);
         const args = {
           name: toRaw(state).administrationName,
           publicName: toRaw(state).administrationPublicName,
           assessments: submittedAssessments,
           dateOpen: toRaw(state).dates[0],
-          dateClose: toRaw(state).dates[1],
+          dateClose,
           sequential: toRaw(state).sequential,
           orgs: orgs,
           isTestData: isTestData.value,

diff --git a/src/components/ListUsers.vue b/src/components/ListUsers.vue
@@ -88,6 +88,12 @@ const columns = ref([
     dataType: 'string',
     sort: false,
   },
+  {
+    field: 'email',
+    header: 'Email',
+    dataType: 'string',
+    sort: false,
+  },
   {
     field: 'name.first',
     header: 'First Name',

diff --git a/src/components/auth/SignIn.vue b/src/components/auth/SignIn.vue
@@ -160,7 +160,7 @@ const isValidEmail = (email) => {
 
 const evaluatingEmail = ref(false);
 const allowPassword = ref(true);
-const allowLink = ref(false);
+const allowLink = ref(true);
 
 const validateRoarEmail = _debounce(
   async (email) => {
@@ -175,7 +175,7 @@ const validateRoarEmail = _debounce(
 
       if (emailAvail) {
         console.log(`Email ${email} is available`);
-        allowPassword.value = false;
+        allowPassword.value = true;
         allowLink.value = false;
       } else {
         if (roarfirekit.value.isRoarAuthEmail(email)) {
@@ -184,7 +184,7 @@ const validateRoarEmail = _debounce(
           allowPassword.value = true;
         } else {
           allowLink.value = true;
-          allowPassword.value = false;
+          allowPassword.value = true;
           state.usePassword = false;
         }
       }

diff --git a/src/pages/ProgressReport.vue b/src/pages/ProgressReport.vue
@@ -479,6 +479,7 @@ const exportSelected = (selectedRows) => {
   const computedExportData = _map(selectedRows, ({ user, assignment }) => {
     const tableRow = {
       Username: _get(user, 'username'),
+      Email: _get(user, 'email'),
       First: _get(user, 'name.first'),
       Last: _get(user, 'name.last'),
       Grade: _get(user, 'studentData.grade'),
@@ -518,6 +519,7 @@ const exportAll = async () => {
   const computedExportData = _map(exportData, ({ user, assignment }) => {
     const tableRow = {
       Username: _get(user, 'username'),
+      Email: _get(user, 'email'),
       First: _get(user, 'name.first'),
       Last: _get(user, 'name.last'),
       Grade: _get(user, 'studentData.grade'),
@@ -562,6 +564,7 @@ const columns = computed(() => {
 
   const tableColumns = [
     { field: 'user.username', header: 'Username', dataType: 'text', pinned: true, sort: true },
+    { field: 'user.email', header: 'Email', dataType: 'text', pinned: false, sort: true },
     { field: 'user.name.first', header: 'First Name', dataType: 'text', sort: true },
     { field: 'user.name.last', header: 'Last Name', dataType: 'text', sort: true },
     { field: 'user.studentData.grade', header: 'Grade', dataType: 'text', sort: true, filter: false },

diff --git a/src/pages/RegisterStudents.vue b/src/pages/RegisterStudents.vue
@@ -160,7 +160,7 @@ const dropdown_options = ref([
     label: 'Required',
     items: [
       { label: 'Student Username', value: 'username' },
-      // { label: 'Student Email', value: 'email' },
+      { label: 'Student Email', value: 'email' },
       { label: 'Grade', value: 'grade' },
       { label: 'Password', value: 'password' },
       { label: 'Student Date of Birth', value: 'dob' },

diff --git a/src/pages/ScoreReport.vue b/src/pages/ScoreReport.vue
@@ -796,6 +796,7 @@ const exportSelected = (selectedRows) => {
   const computedExportData = _map(selectedRows, ({ user, assignment }) => {
     let tableRow = {
       Username: _get(user, 'username'),
+      Email: _get(user, 'email'),
       First: _get(user, 'name.first'),
       Last: _get(user, 'name.last'),
       Grade: _get(user, 'studentData.grade'),
@@ -850,6 +851,7 @@ const exportAll = async () => {
   const computedExportData = _map(exportData, ({ user, assignment }) => {
     let tableRow = {
       Username: _get(user, 'username'),
+      Email: _get(user, 'email'),
       First: _get(user, 'name.first'),
       Last: _get(user, 'name.last'),
       Grade: _get(user, 'studentData.grade'),
@@ -921,6 +923,7 @@ const columns = computed(() => {
   if (scoresDataQuery.value === undefined) return [];
   const tableColumns = [
     { field: 'user.username', header: 'Username', dataType: 'text', pinned: true, sort: true },
+    { field: 'user.email', header: 'Email', dataType: 'text', pinned: false, sort: true },
     { field: 'user.name.first', header: 'First Name', dataType: 'text', sort: true },
     { field: 'user.name.last', header: 'Last Name', dataType: 'text', sort: true },
     { field: 'user.studentData.grade', header: 'Grade', dataType: 'text', sort: true, filter: false },