- {`${user.lname} , ${user.fname} ${
- user.mname ? user.mname : ""
- }`}
+ {`${user.lname} , ${user.fname} `}
User Type: {user.type}
diff --git a/src-frontend-react/src/components/AdminTools/UserManagementForm/index.js b/src-frontend-react/src/components/AdminTools/UserManagementForm/index.js
index adc0ee9..85969f2 100644
--- a/src-frontend-react/src/components/AdminTools/UserManagementForm/index.js
+++ b/src-frontend-react/src/components/AdminTools/UserManagementForm/index.js
@@ -12,15 +12,9 @@ import { user_type } from "@prisma/client";
const DEFAULT_FORM_VALUES = {
id: "",
fname: "",
- mname: "",
lname: "",
- addr: "",
- cnum: "",
- emailaddr: "",
- bdate: "",
type: "",
login_username: "", // Add username field
- login_password: "", // Add password field
};
/// NOTE The `{ ...DEFAULT_FORM_VALUES }` is used because simply
@@ -102,9 +96,7 @@ export const UserManagementForm = () => {
...usersList.map((user) => {
return {
value: user,
- label: `[${user.type}] ${user.lname}, ${user.fname}${
- user.mname ? " " + user.mname : ""
- }`,
+ label: `[${user.type}] ${user.lname}, ${user.fname}`,
};
}),
]);
@@ -120,7 +112,6 @@ export const UserManagementForm = () => {
const user = e.value;
user.login_password = "";
- user.bdate = moment(user.bdate).format("YYYY-MM-DD");
setFormData(user);
console.log(user);
@@ -128,7 +119,7 @@ export const UserManagementForm = () => {
const handleChange = (e) => {
let { name, value } = e.target;
- if (name === "fname" || name === "mname" || name === "lname") {
+ if (name === "fname" || name === "lname") {
console.log("triggered");
value = value.replace(/\w\S*/g, function (txt) {
return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();
@@ -160,41 +151,6 @@ export const UserManagementForm = () => {
newFormErrors.lname = "";
}
- // Validate Address
- if (formData.addr.trim() === "") {
- newFormErrors.addr = "Address is required";
- isValid = false;
- } else {
- newFormErrors.addr = "";
- }
-
- // Validate Email
- const emailPattern = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i;
- if (!formData.emailaddr.trim().match(emailPattern)) {
- newFormErrors.emailaddr = "Invalid email address";
- isValid = false;
- } else {
- newFormErrors.emailaddr = "";
- }
-
- // Validate Phone Number
- const phonepattern = /^(09|\+639)\d{9}$/;
- if (!formData.cnum.trim().match(phonepattern)) {
- newFormErrors.cnum =
- "phone number must be in 09xxxxxxxxx or in +639xxxxxxxxx format";
- isValid = false;
- } else {
- newFormErrors.cnum = "";
- }
-
- // Validate Birthday (you can add custom date validation logic)
- if (formData.bdate.trim() === "") {
- newFormErrors.bdate = "Birthday is required";
- isValid = false;
- } else {
- newFormErrors.bdate = "";
- }
-
// Validate Username
if (formData.login_username.trim() === "") {
newFormErrors.login_username = "Username is required";
@@ -203,28 +159,6 @@ export const UserManagementForm = () => {
newFormErrors.login_username = "";
}
- // Validate Password
- const passwordPattern = /^(?=.*[A-Za-z])(?=.*\d)(?=.*[@#$%^&+=!_]).{8,}$/;
- if (
- !formData.login_password.trim().match(passwordPattern) &&
- formData.login_password.length !== 0 &&
- formData.id
- ) {
- newFormErrors.login_password =
- "Password must be left blank to leave unchanged or:\n- be at least 8 characters long\n- contain at least 1 alphabet and 1 numeric character\n- contain at least 1 special character (@#$%^&+=!_)";
-
- isValid = false;
- } else if (
- !formData.login_password.trim().match(passwordPattern) &&
- !formData.id
- ) {
- newFormErrors.login_password =
- "Password must be:\n- be at least 8 characters long\n- contain at least 1 alphabet and 1 numeric character\n- contain at least 1 special character (@#$%^&+=!_)";
- isValid = false;
- } else {
- newFormErrors.login_password = "";
- }
-
setFormErrors(newFormErrors);
return isValid;
};
@@ -236,12 +170,7 @@ export const UserManagementForm = () => {
// Handle form submission here (e.g., send data to a server).
const formatted = {
fname: formData.fname,
- mname: formData.mname,
lname: formData.lname,
- addr: formData.addr,
- cnum: formData.cnum,
- emailaddr: formData.emailaddr,
- bdate: moment(new Date(formData.bdate)).toISOString(),
type: formData.type,
login_username: formData.login_username,
};
@@ -388,15 +317,6 @@ export const UserManagementForm = () => {
/>
{formErrors.fname}
-
- Middle Name
-
-
Last Name
{
{formErrors.lname}
-
- Address
-
- {formErrors.addr}
-
-
-
- Email
-
- {formErrors.emailaddr}
-
-
- Phone Number
-
- {formErrors.cnum}
-
-
-
- Birthday
-
- {formErrors.bdate}
-
-
+
User Type
{userTypes.map((userType) => (
@@ -492,6 +366,7 @@ export const UserManagementForm = () => {
Password
{
className="w-100 px-3 justify-content-between"
>
- {`[${user.type}] ${user.lname}, ${user.fname} ${user.mname}`}
+ {`[${user.type}] ${user.lname}, ${user.fname}`}