From 30d9902beaba18e7953bc4925b34dcb0988beb64 Mon Sep 17 00:00:00 2001
From: s85708 <s85708@bht-berlin.de>
Date: Wed, 25 Jan 2023 23:34:21 +0100
Subject: [PATCH] everything done
---
.../components/DegreeCourseItem.js | 34 ++++++-----
.../components/ApplicationItem.js | 58 ++++++++++---------
my-app/src/react/user/components/UserItem.js | 34 ++++++-----
3 files changed, 66 insertions(+), 60 deletions(-)
diff --git a/my-app/src/react/degreeCourse/components/DegreeCourseItem.js b/my-app/src/react/degreeCourse/components/DegreeCourseItem.js
index 2d7c358..7ec7766 100644
--- a/my-app/src/react/degreeCourse/components/DegreeCourseItem.js
+++ b/my-app/src/react/degreeCourse/components/DegreeCourseItem.js
@@ -57,22 +57,24 @@ class DegreeCourseItem extends Component {
<div>
<Card style={{ width: "25rem", background: '#ebebeb', margin: '0.5rem' }} id={itemID}>
{cardHeader}
- <Table responsive="sm">
- <tbody>
- <tr id="UniversityName">
- <td><b>Universität:</b></td>
- <td style={{ textAlign: 'left' }}>{degreeCourse.universityName}</td>
- </tr>
- <tr id="DepartmentName">
- <td><b>Fachbereich:</b></td>
- <td style={{ textAlign: 'left' }}>{degreeCourse.departmentName}</td>
- </tr>
- <tr id="Name">
- <td><b>Studiengang:</b></td>
- <td style={{ textAlign: 'left' }}>{degreeCourse.name}</td>
- </tr>
- </tbody>
- </Table>
+ <Card.Body style={{padding: "1rem"}}>
+ <Table responsive="sm">
+ <tbody>
+ <tr id="UniversityName" style={{ textAlign: 'left' }}>
+ <td><b>Universität:</b></td>
+ <td>{degreeCourse.universityName}</td>
+ </tr>
+ <tr id="DepartmentName" style={{ textAlign: 'left' }}>
+ <td><b>Fachbereich:</b></td>
+ <td>{degreeCourse.departmentName}</td>
+ </tr>
+ <tr id="Name" style={{ textAlign: 'left' }}>
+ <td><b>Studiengang:</b></td>
+ <td>{degreeCourse.name}</td>
+ </tr>
+ </tbody>
+ </Table>
+ </Card.Body>
<Card.Footer style={{ display: 'flex', justifyContent: 'space-evenly' }}>
{cardFooter}
</Card.Footer>
diff --git a/my-app/src/react/degreeCourseApplication/components/ApplicationItem.js b/my-app/src/react/degreeCourseApplication/components/ApplicationItem.js
index 8f3f4c7..67d3ad3 100644
--- a/my-app/src/react/degreeCourseApplication/components/ApplicationItem.js
+++ b/my-app/src/react/degreeCourseApplication/components/ApplicationItem.js
@@ -29,34 +29,36 @@ class ApplicationItem extends Component {
<div>
<Card style={{ width: "25rem", background: '#ebebeb', margin: '0.5rem' }} id={itemID}>
<Card.Header><b>{application.applicantUserID}: {application.universityShortName} {application.targetPeriodShortName} {application.targetPeriodYear}</b></Card.Header>
- <Table responsive="sm">
- <tbody>
- <tr id="ApplicantUserID">
- <td><b>User:</b></td>
- <td style={{ textAlign: 'left' }}>{application.applicantUserID}</td>
- </tr>
- <tr id="DegreeCourseName">
- <td><b>Studiengang:</b></td>
- <td style={{ textAlign: 'left' }}>{application.degreeCourseName}</td>
- </tr>
- <tr id="TargetPeriodYear">
- <td><b>Bewerbungsjahr:</b></td>
- <td style={{ textAlign: 'left' }}>{application.targetPeriodYear}</td>
- </tr>
- <tr id="TargetPeriodShortName">
- <td><b>Bewerbungssemester:</b></td>
- <td style={{ textAlign: 'left' }}>{application.targetPeriodShortName}</td>
- </tr>
- <tr id="UniversityShortName">
- <td><b>Universität:</b></td>
- <td style={{ textAlign: 'left' }}>{application.universityShortName}</td>
- </tr>
- <tr id="DepartmentShortName">
- <td><b>Fachbereich:</b></td>
- <td style={{ textAlign: 'left' }}>{application.departmentShortName}</td>
- </tr>
- </tbody>
- </Table>
+ <Card.Body style={{padding: '1rem'}}>
+ <Table responsive="sm">
+ <tbody>
+ <tr id="ApplicantUserID" style={{ textAlign: 'left' }}>
+ <td><b>User:</b></td>
+ <td>{application.applicantUserID}</td>
+ </tr>
+ <tr id="DegreeCourseName" style={{ textAlign: 'left' }}>
+ <td><b>Studiengang:</b></td>
+ <td>{application.degreeCourseName}</td>
+ </tr>
+ <tr id="TargetPeriodYear" style={{ textAlign: 'left' }}>
+ <td><b>Bewerbungsjahr:</b></td>
+ <td>{application.targetPeriodYear}</td>
+ </tr>
+ <tr id="TargetPeriodShortName" style={{ textAlign: 'left' }}>
+ <td><b>Bewerbungssemester:</b></td>
+ <td>{application.targetPeriodShortName}</td>
+ </tr>
+ <tr id="UniversityShortName" style={{ textAlign: 'left' }}>
+ <td><b>Universität:</b></td>
+ <td>{application.universityShortName}</td>
+ </tr>
+ <tr id="DepartmentShortName" style={{ textAlign: 'left' }}>
+ <td><b>Fachbereich:</b></td>
+ <td>{application.departmentShortName}</td>
+ </tr>
+ </tbody>
+ </Table>
+ </Card.Body>
<Card.Footer style={{ display: 'flex', justifyContent: 'space-evenly' }}>
<Button variant="primary" type="submit" onClick={(e) => this.props.handleShowDeleteModal(e, dialogData)} id={deleteButtonID} style={{ background: '#ffc800', color: 'black', border: 'none' }}>
Delete
diff --git a/my-app/src/react/user/components/UserItem.js b/my-app/src/react/user/components/UserItem.js
index 33712c6..e56168a 100644
--- a/my-app/src/react/user/components/UserItem.js
+++ b/my-app/src/react/user/components/UserItem.js
@@ -18,22 +18,24 @@ class UserItem extends Component {
<div>
<Card style={{ width: "18rem", background: '#ebebeb', margin: "0.5rem" }} id={itemID}>
<Card.Header><b>{user.firstName} {user.lastName}</b></Card.Header>
- <Table responsive="sm">
- <tbody>
- <tr>
- <td><b>User ID:</b></td>
- <td style={{ textAlign: 'left' }}>{user.userID}</td>
- </tr>
- <tr>
- <td><b>First Name:</b></td>
- <td style={{ textAlign: 'left' }}>{user.firstName}</td>
- </tr>
- <tr>
- <td><b>Last Name:</b></td>
- <td style={{ textAlign: 'left' }}>{user.lastName}</td>
- </tr>
- </tbody>
- </Table>
+ <Card.Body style={{padding: '1rem'}}>
+ <Table responsive="sm">
+ <tbody>
+ <tr style={{ textAlign: 'left' }}>
+ <td><b>User ID:</b></td>
+ <td>{user.userID}</td>
+ </tr>
+ <tr style={{ textAlign: 'left' }}>
+ <td><b>First Name:</b></td>
+ <td>{user.firstName}</td>
+ </tr>
+ <tr style={{ textAlign: 'left' }}>
+ <td><b>Last Name:</b></td>
+ <td>{user.lastName}</td>
+ </tr>
+ </tbody>
+ </Table>
+ </Card.Body>
<Card.Footer style={{ display: 'flex', justifyContent: 'space-evenly' }}>
<Button variant="primary" onClick={(e) => this.props.handleShowEditPage(e, user)} id={editButtonID} >Edit</Button>
<Button variant="primary" type="submit" onClick={(e) => this.props.handleShowDeleteModal(e, dialogData)} id={deleteButtonID} style={{ background: '#ffc800', color: 'black', border: 'none' }}>
--
GitLab