keannu125/StudE-Frontend
1
0
Fork 0
mirror of https://github.com/lemeow125/StudE-Frontend.git synced 2025-04-19 16:31:21 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improvements to user info page. Made year level course and semester menus functional

Browse source
This commit is contained in:
Keannu Christian Bernasol 2023-07-18 14:46:09 +08:00
parent 160ffc5763
commit 1aed66150c
1 changed files with 37 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/routes/UserInfoPage/UserInfoPage.tsx
View file

@ -66,6 +66,9 @@ export default function UserInfoPage() {
first_name: data[1].first_name, first_name: data[1].first_name,
last_name: data[1].last_name, last_name: data[1].last_name,
}); });
setSelectedCourse(data[1].course);
setSelectedSemester(data[1].semester);
setSelectedYearLevel(data[1].year_level);
}, },
}); });
const mutation = useMutation({ const mutation = useMutation({
@ -88,7 +91,7 @@ export default function UserInfoPage() {
console.log("Semesters", data[1]); console.log("Semesters", data[1]);
let semestersData = data[1].map((semester: Semester) => ({ let semestersData = data[1].map((semester: Semester) => ({
label: semester.name, label: semester.name,
value: semester.id, value: semester.name,
shortname: semester.shortname, shortname: semester.shortname,
})); }));
// Update the 'semesters' state // Update the 'semesters' state
@ -245,7 +248,6 @@ export default function UserInfoPage() {
/> />
</View> </View>
</View> </View>
<View style={styles.padding} />
<View style={styles.flex_row}> <View style={styles.flex_row}>
<View style={{ flex: 1 }}> <View style={{ flex: 1 }}>
<Text style={styles.text_white_small_bold}>Year Level</Text> <Text style={styles.text_white_small_bold}>Year Level</Text>
@ -263,6 +265,9 @@ export default function UserInfoPage() {
setCourseOpen(false); setCourseOpen(false);
setSubjectsOpen(false); setSubjectsOpen(false);
}} }}
onChangeValue={() => {
setUser({ ...user, year_level: selected_yearlevel });
}}
setValue={setSelectedYearLevel} setValue={setSelectedYearLevel}
placeholder={user.year_level} placeholder={user.year_level}
placeholderStyle={{ placeholderStyle={{
@ -274,8 +279,11 @@ export default function UserInfoPage() {
...styles.text_white_tiny_bold, ...styles.text_white_tiny_bold,
...{ textAlign: "left" }, ...{ textAlign: "left" },
}} }}
containerStyle={{ zIndex: 4000 }} dropDownContainerStyle={{
dropDownContainerStyle={{ backgroundColor: colors.primary_2 }} backgroundColor: colors.primary_2,
zIndex: 4000,
}}
dropDownDirection="TOP"
/> />
</View> </View>
</View> </View>
@ -296,6 +304,10 @@ export default function UserInfoPage() {
setCourseOpen(false); setCourseOpen(false);
setSubjectsOpen(false); setSubjectsOpen(false);
}} }}
onChangeValue={() => {
console.log(selected_semester);
setUser({ ...user, semester: selected_semester });
}}
setValue={setSelectedSemester} setValue={setSelectedSemester}
placeholder={user.semester} placeholder={user.semester}
placeholderStyle={{ placeholderStyle={{
@ -307,8 +319,11 @@ export default function UserInfoPage() {
...styles.text_white_tiny_bold, ...styles.text_white_tiny_bold,
...{ textAlign: "left" }, ...{ textAlign: "left" },
}} }}
containerStyle={{ zIndex: 3000 }} dropDownContainerStyle={{
dropDownContainerStyle={{ backgroundColor: colors.primary_2 }} backgroundColor: colors.primary_2,
zIndex: 3000,
}}
dropDownDirection="TOP"
/> />
</View> </View>
</View> </View>
@ -329,6 +344,9 @@ export default function UserInfoPage() {
setCourseOpen(open); setCourseOpen(open);
setSubjectsOpen(false); setSubjectsOpen(false);
}} }}
onChangeValue={() => {
setUser({ ...user, course: selected_course });
}}
setValue={setSelectedCourse} setValue={setSelectedCourse}
placeholder={user.course} placeholder={user.course}
placeholderStyle={{ placeholderStyle={{
@ -340,8 +358,11 @@ export default function UserInfoPage() {
...styles.text_white_tiny_bold, ...styles.text_white_tiny_bold,
...{ textAlign: "left" }, ...{ textAlign: "left" },
}} }}
containerStyle={{ zIndex: 2000 }} dropDownContainerStyle={{
dropDownContainerStyle={{ backgroundColor: colors.primary_2 }} backgroundColor: colors.primary_2,
zIndex: 2000,
}}
dropDownDirection="TOP"
/> />
</View> </View>
</View> </View>
@ -376,8 +397,11 @@ export default function UserInfoPage() {
...styles.text_white_tiny_bold, ...styles.text_white_tiny_bold,
...{ textAlign: "left" }, ...{ textAlign: "left" },
}} }}
containerStyle={{ zIndex: 12000 }} dropDownContainerStyle={{
dropDownContainerStyle={{ backgroundColor: colors.primary_2 }} backgroundColor: colors.primary_2,
zIndex: 1000,
}}
dropDownDirection="TOP"
/> />
</View> </View>
</View> </View>
@ -389,10 +413,10 @@ export default function UserInfoPage() {
mutation.mutate({ mutation.mutate({
first_name: user.first_name, first_name: user.first_name,
last_name: user.last_name, last_name: user.last_name,
course: user.course, course: selected_course,
semester: user.semester, semester: selected_semester,
subjects: [], subjects: [],
year_level: user.year_level, year_level: selected_yearlevel,
}); });
} }
setIsEditable(!isEditable); setIsEditable(!isEditable);