Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ import './App.module.scss'

function App() {
return (
<Header />
<>
<Header />
</>
);
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/Dropdown/Dropdown.module.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import '../../mixins/fonts.scss';

.dd_wrapper {
@include MontserratSemiBlod;
@include MontserratSemiBold;
width: 100%;
display: flex;
color: #FFCD00;
Expand Down
14 changes: 14 additions & 0 deletions src/components/Table/Table.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
@import '../../mixins/fonts.scss';

table {
@include Montserrat;
table-layout: fixed;
width: 50%;
line-height: 20px;
border-collapse: collapse;
}

th, td {
padding: 5px;
border: 2px solid rgb(190, 184, 184);
}
45 changes: 45 additions & 0 deletions src/components/Table/Table.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
// eslint-disable-next-line no-use-before-define
import React from 'react'
import './Table.module.scss'

interface TableProps {
objItem : any;
}

const Table: React.FC<TableProps> = ({ objItem = [{}] }) => {
const checkExam = (item:any) => {
if ((item.numOf5 * 5 + item.numOf4 * 4 + item.numOf3 * 3 + item.numOf2 * 2) / (item.numOf5 + item.numOf4 + item.numOf3 + item.numOf2) > 4.2 && item.missed < 8) return ('Получен')
return ('Не получен')
}
return (
<table>
<caption> Информация студента о получении зачёта</caption>
<thead>
<tr>
<th scope="col"> Название предмета </th>
<th scope="col"> 5 </th>
<th scope="col"> 4 </th>
<th scope="col"> 3 </th>
<th scope="col"> 2 </th>
<th scope="col"> Пропущенные занятия </th>
<th scope="col"> Зачёт </th>
</tr>
</thead>
<tbody>
{ objItem.map((item:any) => (
<tr>
<td>{item.objName}</td>
<td>{item.numOf5}</td>
<td>{item.numOf4}</td>
<td>{item.numOf3}</td>
<td>{item.numOf2}</td>
<td>{item.missed}</td>
<td>{checkExam(item)}</td>
</tr>
))}
</tbody>
</table>
)
}

export default Table
6 changes: 5 additions & 1 deletion src/mixins/fonts.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@
}


@mixin MontserratSemiBlod {
@mixin MontserratSemiBold {
font-family: Montserrat-SemiBold;
line-height: 0px;
}

@mixin Montserrat {
font-family: Montserrat;
}