@nualang/nualang-ui-components 0.1.1260 → 0.1.1261

package/dist/Assignments/CreateAssignmentDialog/CreateAssignmentDialog.js

@@ -14,8 +14,6 @@ var _AdapterDayjs = require("@mui/x-date-pickers/AdapterDayjs");
 var _LocalizationProvider = require("@mui/x-date-pickers/LocalizationProvider");
 var _DatePicker = require("@mui/x-date-pickers/DatePicker");
 var _mui = require("tss-react/mui");
-var _ArrowDropDown = _interopRequireDefault(require("@mui/icons-material/ArrowDropDown"));
-var _ArrowDropUp = _interopRequireDefault(require("@mui/icons-material/ArrowDropUp"));
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _AssignmentSelectExercise = _interopRequireDefault(require("../AssignmentSelectExercise/AssignmentSelectExercise"));
 var _AssignmentExerciseSelector = _interopRequireDefault(require("../AssignmentExerciseSelector/AssignmentExerciseSelector"));
@@ -57,7 +55,7 @@ function CreateAssignmentDialog({
   getCourses,
   initialData = {},
   dialogTitle,
-  userEmail = ''
+  userEmail = ""
 }) {
   const {
     classes
@@ -71,8 +69,8 @@ function CreateAssignmentDialog({
   const [assignment, setAssignment] = (0, _react.useState)({
     classroomId: classroom?.length > 0 ? [classroom] : [],
     assignedStudents: members?.map(member => member.memberId),
-    title: "",
-    instructions: "",
+    title: initialData.title ? initialData.title : undefined,
+    instructions: initialData.instructions ? initialData.instructions : t("default_assignment_instructions"),
     type: "assignment",
     scheduleDate: (0, _dayjs.default)(),
     dueDate: (0, _dayjs.default)().add(1, "day"),
@@ -182,6 +180,15 @@ function CreateAssignmentDialog({
       ...assignment,
       courses: filteredCourses
     });
+    const selectedTopicIds = new Set(submittedExercises.map(ex => ex.courseSectionTopicId));
+    const topicNames = Array.from(new Set(filteredCourses.flatMap(course => course.sections?.flatMap(section => section.topics?.flatMap(topic => {
+      const topicKey = `${course.courseId}|${section.sectionId}|${topic.topicId}`;
+      return selectedTopicIds.has(topicKey) ? topic.topicName : [];
+    }))).filter(Boolean)));
+    setAssignment(prev => ({
+      ...prev,
+      title: topicNames.length ? topicNames.join(", ") : undefined
+    }));
   }, [selectedCourses, submittedExercises]);
   const classroomMembers = async uniqueClassroomMembers => {
     const formattedMembers = await getMemberDetails(uniqueClassroomMembers);
@@ -212,13 +219,6 @@ function CreateAssignmentDialog({
   const handleCloseSelectExercise = () => {
     setIsSelectExerciseOpen(false);
   };
-  const [anchorEl, setAnchorEl] = (0, _react.useState)(null);
-  const handleMenuOpen = event => {
-    setAnchorEl(event.currentTarget);
-  };
-  const handleMenuClose = () => {
-    setAnchorEl(null);
-  };
   const handleChange = field => event => {
     let value = event?.target?.value ?? event;
     setAssignment(prev => {
@@ -331,7 +331,7 @@ function CreateAssignmentDialog({
               MenuProps: {
                 PaperProps: {
                   sx: {
-                    width: 'auto',
+                    width: "auto",
                     maxWidth: 400
                   }
                 },
@@ -390,21 +390,6 @@ function CreateAssignmentDialog({
                 })
               }, c.classroomId))
             })]
-          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TextField, {
-            "data-cy": "assignment-title-input",
-            label: t("assignment_title"),
-            fullWidth: true,
-            value: assignment.title,
-            onChange: handleChange("title"),
-            required: true
-          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TextField, {
-            "data-cy": "assignment-description-input",
-            label: t("assignment_description"),
-            fullWidth: true,
-            multiline: true,
-            rows: 3,
-            value: assignment.instructions,
-            onChange: handleChange("instructions")
           }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Tooltip, {
             disableHoverListener: selectedCourses?.length > 0,
             disableFocusListener: selectedCourses?.length > 0,
@@ -412,7 +397,7 @@ function CreateAssignmentDialog({
             title: t("no_shared_courses"),
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
               style: {
-                display: 'inline-block'
+                display: "inline-block"
               },
               children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
                 "data-cy": "assignment-exercise-selector-button",
@@ -453,7 +438,25 @@ function CreateAssignmentDialog({
             flexDirection: "column",
             gap: 2
           },
-          children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.FormControl, {
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TextField, {
+            "data-cy": "assignment-title-input",
+            label: t("assignment_title"),
+            fullWidth: true,
+            value: assignment.title,
+            onChange: handleChange("title"),
+            required: true,
+            InputLabelProps: {
+              shrink: true
+            }
+          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TextField, {
+            "data-cy": "assignment-description-input",
+            label: t("assignment_description"),
+            fullWidth: true,
+            multiline: true,
+            rows: 3,
+            value: assignment.instructions,
+            onChange: handleChange("instructions")
+          }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.FormControl, {
             fullWidth: true,
             disabled: !assignment.classroomId,
             children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.InputLabel, {
@@ -484,17 +487,49 @@ function CreateAssignmentDialog({
                 })]
               }, member.memberId))
             })]
-          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_LocalizationProvider.LocalizationProvider, {
-            dateAdapter: _AdapterDayjs.AdapterDayjs,
-            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_DatePicker.DatePicker, {
-              "data-cy": "assignment-date-picker",
-              label: t("due_date"),
-              value: assignment.dueDate,
-              onChange: date => setAssignment(prev => ({
-                ...prev,
-                dueDate: date
-              }))
-            })
+          }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
+            sx: {
+              display: "flex",
+              width: "100%",
+              alignItems: "center",
+              justifyContent: "space-between"
+            },
+            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_LocalizationProvider.LocalizationProvider, {
+              dateAdapter: _AdapterDayjs.AdapterDayjs,
+              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_DatePicker.DatePicker, {
+                label: t("assign_date"),
+                value: assignment.scheduleDate,
+                onChange: date => setAssignment(prev => ({
+                  ...prev,
+                  scheduleDate: date
+                })),
+                disablePast: true,
+                maxDate: assignment.dueDate,
+                sx: {
+                  width: "45%"
+                },
+                format: "DD MMM YYYY"
+              })
+            }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
+              variant: "h4",
+              children: "-"
+            }), " ", /*#__PURE__*/(0, _jsxRuntime.jsx)(_LocalizationProvider.LocalizationProvider, {
+              dateAdapter: _AdapterDayjs.AdapterDayjs,
+              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_DatePicker.DatePicker, {
+                "data-cy": "assignment-date-picker",
+                label: t("due"),
+                value: assignment.dueDate,
+                disablePast: true,
+                onChange: date => setAssignment(prev => ({
+                  ...prev,
+                  dueDate: date
+                })),
+                sx: {
+                  width: "45%"
+                },
+                format: "DD MMM YYYY"
+              })
+            })]
           })]
         })
       })]
@@ -517,66 +552,17 @@ function CreateAssignmentDialog({
         },
         onClick: handleClose,
         children: t("cancel")
-      }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.ButtonGroup, {
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.ButtonGroup, {
         variant: "contained",
         color: "primary",
         sx: {
           borderRadius: 10
         },
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
           "data-cy": "assignment-assign-button",
           disabled: !assignment.assignedStudents?.length || !assignment.scheduleDate || !assignment.dueDate || !assignment.title || !assignment.classroomId || !assignment.exercises?.length,
           onClick: async () => await handleCreateAssignment(),
           children: t("assign")
-        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
-          color: "primary",
-          onClick: handleMenuOpen,
-          sx: {
-            minWidth: "40px",
-            padding: "6px"
-          },
-          disabled: !assignment.assignedStudents?.length || !assignment.scheduleDate || !assignment.dueDate || !assignment.title || !assignment.classroomId || !assignment.exercises?.length,
-          children: anchorEl ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_ArrowDropUp.default, {}) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_ArrowDropDown.default, {})
-        })]
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Popover, {
-        anchorEl: anchorEl,
-        open: Boolean(anchorEl),
-        onClose: handleMenuClose,
-        anchorOrigin: {
-          vertical: "top",
-          horizontal: "left"
-        },
-        transformOrigin: {
-          vertical: "bottom",
-          horizontal: "left"
-        },
-        children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
-          display: "flex",
-          flexDirection: "column",
-          width: "100%",
-          gap: 1,
-          padding: 2,
-          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_LocalizationProvider.LocalizationProvider, {
-            dateAdapter: _AdapterDayjs.AdapterDayjs,
-            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_DatePicker.DatePicker, {
-              label: t("assign_date"),
-              value: assignment.scheduleDate,
-              onChange: date => setAssignment(prev => ({
-                ...prev,
-                scheduleDate: date
-              }))
-            })
-          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
-            variant: "outlined",
-            color: "primary",
-            fullWidth: true,
-            "data-cy": "assignment-schedule-button",
-            onClick: async () => {
-              await handleCreateAssignment();
-              handleMenuClose();
-            },
-            children: t("schedule_assignment")
-          })]
         })
       })]
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_AssignmentSelectExercise.default, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nualang/nualang-ui-components",
-  "version": "0.1.1260",
+  "version": "0.1.1261",
   "main": "dist/index.js",
   "files": [
     "dist",