Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • s85708/web-frontend
1 result
Show changes
Commits on Source (2)
Hide whitespace changes
Inline Side-by-side
my-app/src/react/degreeCourse/components/DegreeCourseItem.js
View file @ 3607c054
......@@ -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>
......
my-app/src/react/degreeCourseApplication/components/ApplicationItem.js
View file @ 3607c054
......@@ -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
......
my-app/src/react/entity/TopMenu.js
View file @ 3607c054
......@@ -62,14 +62,14 @@ class TopMenu extends Component {
<Nav.Link>DegreeCourse-Management</Nav.Link>
</LinkContainer>
<LinkContainer to="/degreeCourseApplicationManagement" id="OpenDegreeCourseApplicationManagementPageButton" onClick={this.handleApplicationManagementButtonAction}>
<Nav.Link>Studienbewerbung-Management</Nav.Link>
<Nav.Link>Studienbewerbungs-Management</Nav.Link>
</LinkContainer>
</>
} else if (this.props.user) {
OpenManagementPageButtons =
<>
<LinkContainer to="/degreeCourseApplicationManagement" id="OpenDegreeCourseApplicationManagementPageButton" onClick={this.handleApplicationManagementButtonAction}>
<Nav.Link>Studienbewerbung-Management</Nav.Link>
<Nav.Link>Studienbewerbungs-Management</Nav.Link>
</LinkContainer>
<LinkContainer to="/degreeCourseManagement" id="OpenDegreeCourseManagementPageButton" onClick={this.handleDegreeCourseManagementButtonAction}>
<Nav.Link>DegreeCourse-List</Nav.Link>
......
my-app/src/react/user/components/UserItem.js
View file @ 3607c054
......@@ -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' }}>
......
my-app/src/react/user/state/UserManagementActions.js
View file @ 3607c054
......@@ -12,8 +12,6 @@ export const PRESS_EDIT_BUTTON = 'PRESS_EDIT_BUTTON';
const URL = process.env.REACT_APP_SERVER
//Pending, Success, Error Actions
export function getAllUsersAction(users) {
return {
type: SHOW_ALL_USERS,
......@@ -171,8 +169,6 @@ export function deleteUserWithID(userID, token) {
}
//Backend Callings
export function getAllUsers(token) {
const requestOptions = {
method: 'GET',
......