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 { ...@@ -57,22 +57,24 @@ class DegreeCourseItem extends Component {
<div> <div>
<Card style={{ width: "25rem", background: '#ebebeb', margin: '0.5rem' }} id={itemID}> <Card style={{ width: "25rem", background: '#ebebeb', margin: '0.5rem' }} id={itemID}>
{cardHeader} {cardHeader}
<Table responsive="sm"> <Card.Body style={{padding: "1rem"}}>
<tbody> <Table responsive="sm">
<tr id="UniversityName"> <tbody>
<td><b>Universität:</b></td> <tr id="UniversityName" style={{ textAlign: 'left' }}>
<td style={{ textAlign: 'left' }}>{degreeCourse.universityName}</td> <td><b>Universität:</b></td>
</tr> <td>{degreeCourse.universityName}</td>
<tr id="DepartmentName"> </tr>
<td><b>Fachbereich:</b></td> <tr id="DepartmentName" style={{ textAlign: 'left' }}>
<td style={{ textAlign: 'left' }}>{degreeCourse.departmentName}</td> <td><b>Fachbereich:</b></td>
</tr> <td>{degreeCourse.departmentName}</td>
<tr id="Name"> </tr>
<td><b>Studiengang:</b></td> <tr id="Name" style={{ textAlign: 'left' }}>
<td style={{ textAlign: 'left' }}>{degreeCourse.name}</td> <td><b>Studiengang:</b></td>
</tr> <td>{degreeCourse.name}</td>
</tbody> </tr>
</Table> </tbody>
</Table>
</Card.Body>
<Card.Footer style={{ display: 'flex', justifyContent: 'space-evenly' }}> <Card.Footer style={{ display: 'flex', justifyContent: 'space-evenly' }}>
{cardFooter} {cardFooter}
</Card.Footer> </Card.Footer>
......
my-app/src/react/degreeCourseApplication/components/ApplicationItem.js
View file @ 3607c054
...@@ -29,34 +29,36 @@ class ApplicationItem extends Component { ...@@ -29,34 +29,36 @@ class ApplicationItem extends Component {
<div> <div>
<Card style={{ width: "25rem", background: '#ebebeb', margin: '0.5rem' }} id={itemID}> <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> <Card.Header><b>{application.applicantUserID}: {application.universityShortName} {application.targetPeriodShortName} {application.targetPeriodYear}</b></Card.Header>
<Table responsive="sm"> <Card.Body style={{padding: '1rem'}}>
<tbody> <Table responsive="sm">
<tr id="ApplicantUserID"> <tbody>
<td><b>User:</b></td> <tr id="ApplicantUserID" style={{ textAlign: 'left' }}>
<td style={{ textAlign: 'left' }}>{application.applicantUserID}</td> <td><b>User:</b></td>
</tr> <td>{application.applicantUserID}</td>
<tr id="DegreeCourseName"> </tr>
<td><b>Studiengang:</b></td> <tr id="DegreeCourseName" style={{ textAlign: 'left' }}>
<td style={{ textAlign: 'left' }}>{application.degreeCourseName}</td> <td><b>Studiengang:</b></td>
</tr> <td>{application.degreeCourseName}</td>
<tr id="TargetPeriodYear"> </tr>
<td><b>Bewerbungsjahr:</b></td> <tr id="TargetPeriodYear" style={{ textAlign: 'left' }}>
<td style={{ textAlign: 'left' }}>{application.targetPeriodYear}</td> <td><b>Bewerbungsjahr:</b></td>
</tr> <td>{application.targetPeriodYear}</td>
<tr id="TargetPeriodShortName"> </tr>
<td><b>Bewerbungssemester:</b></td> <tr id="TargetPeriodShortName" style={{ textAlign: 'left' }}>
<td style={{ textAlign: 'left' }}>{application.targetPeriodShortName}</td> <td><b>Bewerbungssemester:</b></td>
</tr> <td>{application.targetPeriodShortName}</td>
<tr id="UniversityShortName"> </tr>
<td><b>Universität:</b></td> <tr id="UniversityShortName" style={{ textAlign: 'left' }}>
<td style={{ textAlign: 'left' }}>{application.universityShortName}</td> <td><b>Universität:</b></td>
</tr> <td>{application.universityShortName}</td>
<tr id="DepartmentShortName"> </tr>
<td><b>Fachbereich:</b></td> <tr id="DepartmentShortName" style={{ textAlign: 'left' }}>
<td style={{ textAlign: 'left' }}>{application.departmentShortName}</td> <td><b>Fachbereich:</b></td>
</tr> <td>{application.departmentShortName}</td>
</tbody> </tr>
</Table> </tbody>
</Table>
</Card.Body>
<Card.Footer style={{ display: 'flex', justifyContent: 'space-evenly' }}> <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' }}> <Button variant="primary" type="submit" onClick={(e) => this.props.handleShowDeleteModal(e, dialogData)} id={deleteButtonID} style={{ background: '#ffc800', color: 'black', border: 'none' }}>
Delete Delete
......
my-app/src/react/entity/TopMenu.js
View file @ 3607c054
...@@ -62,14 +62,14 @@ class TopMenu extends Component { ...@@ -62,14 +62,14 @@ class TopMenu extends Component {
<Nav.Link>DegreeCourse-Management</Nav.Link> <Nav.Link>DegreeCourse-Management</Nav.Link>
</LinkContainer> </LinkContainer>
<LinkContainer to="/degreeCourseApplicationManagement" id="OpenDegreeCourseApplicationManagementPageButton" onClick={this.handleApplicationManagementButtonAction}> <LinkContainer to="/degreeCourseApplicationManagement" id="OpenDegreeCourseApplicationManagementPageButton" onClick={this.handleApplicationManagementButtonAction}>
<Nav.Link>Studienbewerbung-Management</Nav.Link> <Nav.Link>Studienbewerbungs-Management</Nav.Link>
</LinkContainer> </LinkContainer>
</> </>
} else if (this.props.user) { } else if (this.props.user) {
OpenManagementPageButtons = OpenManagementPageButtons =
<> <>
<LinkContainer to="/degreeCourseApplicationManagement" id="OpenDegreeCourseApplicationManagementPageButton" onClick={this.handleApplicationManagementButtonAction}> <LinkContainer to="/degreeCourseApplicationManagement" id="OpenDegreeCourseApplicationManagementPageButton" onClick={this.handleApplicationManagementButtonAction}>
<Nav.Link>Studienbewerbung-Management</Nav.Link> <Nav.Link>Studienbewerbungs-Management</Nav.Link>
</LinkContainer> </LinkContainer>
<LinkContainer to="/degreeCourseManagement" id="OpenDegreeCourseManagementPageButton" onClick={this.handleDegreeCourseManagementButtonAction}> <LinkContainer to="/degreeCourseManagement" id="OpenDegreeCourseManagementPageButton" onClick={this.handleDegreeCourseManagementButtonAction}>
<Nav.Link>DegreeCourse-List</Nav.Link> <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 { ...@@ -18,22 +18,24 @@ class UserItem extends Component {
<div> <div>
<Card style={{ width: "18rem", background: '#ebebeb', margin: "0.5rem" }} id={itemID}> <Card style={{ width: "18rem", background: '#ebebeb', margin: "0.5rem" }} id={itemID}>
<Card.Header><b>{user.firstName} {user.lastName}</b></Card.Header> <Card.Header><b>{user.firstName} {user.lastName}</b></Card.Header>
<Table responsive="sm"> <Card.Body style={{padding: '1rem'}}>
<tbody> <Table responsive="sm">
<tr> <tbody>
<td><b>User ID:</b></td> <tr style={{ textAlign: 'left' }}>
<td style={{ textAlign: 'left' }}>{user.userID}</td> <td><b>User ID:</b></td>
</tr> <td>{user.userID}</td>
<tr> </tr>
<td><b>First Name:</b></td> <tr style={{ textAlign: 'left' }}>
<td style={{ textAlign: 'left' }}>{user.firstName}</td> <td><b>First Name:</b></td>
</tr> <td>{user.firstName}</td>
<tr> </tr>
<td><b>Last Name:</b></td> <tr style={{ textAlign: 'left' }}>
<td style={{ textAlign: 'left' }}>{user.lastName}</td> <td><b>Last Name:</b></td>
</tr> <td>{user.lastName}</td>
</tbody> </tr>
</Table> </tbody>
</Table>
</Card.Body>
<Card.Footer style={{ display: 'flex', justifyContent: 'space-evenly' }}> <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" 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' }}> <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'; ...@@ -12,8 +12,6 @@ export const PRESS_EDIT_BUTTON = 'PRESS_EDIT_BUTTON';
const URL = process.env.REACT_APP_SERVER const URL = process.env.REACT_APP_SERVER
//Pending, Success, Error Actions
export function getAllUsersAction(users) { export function getAllUsersAction(users) {
return { return {
type: SHOW_ALL_USERS, type: SHOW_ALL_USERS,
...@@ -171,8 +169,6 @@ export function deleteUserWithID(userID, token) { ...@@ -171,8 +169,6 @@ export function deleteUserWithID(userID, token) {
} }
//Backend Callings
export function getAllUsers(token) { export function getAllUsers(token) {
const requestOptions = { const requestOptions = {
method: 'GET', method: 'GET',
......