From 58823019a7247ec3ab0b342c97030fd8d01cf32c Mon Sep 17 00:00:00 2001
From: mudabbir-ahmad <mudabbira.uk@gmail.com>
Date: Sun, 7 Dec 2025 19:08:25 +0000
Subject: [PATCH] Added handlers to fetch user type correctly for data stored
 in local state rather than on database, added cohort to user view, updated
 default image used for userform.

---
 src/components/entity/users/UserForm.js |  2 +-
 src/components/entity/users/UserView.js | 27 ++++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/components/entity/users/UserForm.js b/src/components/entity/users/UserForm.js
index 37cd4f6..6c760d0 100644
--- a/src/components/entity/users/UserForm.js
+++ b/src/components/entity/users/UserForm.js
@@ -19,7 +19,7 @@ const UserForm = ({originalUser, onSubmit, onCancel}) => {
     // Initialisation -------------
 
     defaultUser.UserID = Math.floor(100000 + Math.random() * 900000);
-    defaultUser.UserImageURL = 'https://images.freeimages.com/images/small-preview/cf5/cellphone-1313194.jpg';
+    defaultUser.UserImageURL = 'https://images.generated.photos/tZmcC6WnzFmgAwRMsBnGYcmaj_NSktxhYzBfTqej_Lo/rs:fit:256:256/czM6Ly9pY29uczgu/Z3Bob3Rvcy1wcm9k/LnBob3Rvcy92M18w/MDE3MjYzLmpwZw.jpg';
 
     const userTypesEndpoint = 'https://softwarehub.uk/unibase/api/usertypes';
     const yearsEndpoint = 'https://softwarehub.uk/unibase/api/years';
diff --git a/src/components/entity/users/UserView.js b/src/components/entity/users/UserView.js
index 832ad6e..2b0d671 100644
--- a/src/components/entity/users/UserView.js
+++ b/src/components/entity/users/UserView.js
@@ -2,12 +2,17 @@ import {Alert, StyleSheet, Text, View} from "react-native";
 import FullWidthImage from "react-native-fullwidth-image";
 import {Button, ButtonTray} from "../../UI/Button";
 import Icons from "../../UI/Icons.js";
+import useLoad from "../../API/useLoad";
 
 const UserView = ({user, onDelete, onModify}) => {
     // Initialisation -------------
 
     const fullName = `${user.UserFirstname} ${user.UserLastname}`;
 
+    const userTypesEndpoint = 'https://softwarehub.uk/unibase/api/usertypes';
+    const yearsEndpoint = 'https://softwarehub.uk/unibase/api/years';
+
+
     const levels = [
         {value: 3, label: '3 (Foundation)'},
         {value: 4, label: '4 (First Year)'},
@@ -17,6 +22,10 @@ const UserView = ({user, onDelete, onModify}) => {
     ];
 
     // State ----------------------
+
+    const [userTypes] = useLoad(userTypesEndpoint);
+    const [years] = useLoad(yearsEndpoint);
+
     // Handlers -------------------
 
     const handleDelete = () => onDelete(user);
@@ -34,6 +43,21 @@ const UserView = ({user, onDelete, onModify}) => {
 
     const userLevelLabel = levels.find(level => level.value === user.UserLevel)?.label || 'Unknown Level';
 
+    const getUserType = (usertypeID) => {
+        if (!usertypeID) return "Unknown";
+        const usertype = userTypes.find(type => type.UsertypeID === usertypeID);
+        return usertype ? usertype.UsertypeName : usertypeID;
+    };
+
+    const getYear = (yearID) => {
+        if (!yearID) return "Unknown";
+        const year = years.find(y => y.YearID === yearID);
+        return year ? year.YearName : yearID;
+    };
+
+    const yearName = getYear(user.UserYearID);
+    const userTypeName = getUserType(user.UserUsertypeID);
+
     // View -----------------------
 
     return (
@@ -45,8 +69,9 @@ const UserView = ({user, onDelete, onModify}) => {
                 <Text style={styles.text}>{user.UserEmail}</Text>
                 <Text style={styles.text}>Level {userLevelLabel}</Text>
                 <Text style={styles.text}>
-                    {user.UserUsertypeName || 'Unknown Type'} <Text style={styles.dimText}>(User Type)</Text>
+                    {user.UserUsertypeName || userTypeName} <Text style={styles.dimText}>(User Type)</Text>
                 </Text>
+                <Text style={styles.text}>Cohort {yearName}</Text>
             </View>
 
             <ButtonTray>