Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
Tia-dev
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dida Adams Arizona
Tia-dev
Commits
a74cf8a7
Commit
a74cf8a7
authored
Jun 14, 2021
by
Dida Adams Arizona
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'GGMAC' into 'master'
update progress report See merge request
!1508
parents
d558a09a
11608abc
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
319 additions
and
0 deletions
+319
-0
Home.js
src/container/Home.js
+12
-0
ProgressReport.js
src/container/ProgressReport.js
+302
-0
homeRoutes.js
src/router/homeRoutes.js
+5
-0
No files found.
src/container/Home.js
View file @
a74cf8a7
...
...
@@ -11,6 +11,7 @@ import IconButton from '@material-ui/core/IconButton';
import
MenuIcon
from
'@material-ui/icons/Menu'
;
import
ExpandMore
from
'@material-ui/icons/ExpandMore'
import
ExpandLess
from
'@material-ui/icons/ExpandLess'
import
ReportIcon
from
'@material-ui/icons/PriorityHigh'
import
ChevronLeftIcon
from
'@material-ui/icons/ChevronLeft'
;
import
ListItem
from
'@material-ui/core/ListItem'
;
import
ListItemIcon
from
'@material-ui/core/ListItemIcon'
;
...
...
@@ -566,6 +567,17 @@ export default function MiniDrawer() {
}
<
/div
>
))}
<
Link
to
=
{
`
${
url
}
/progress-reports`
}
>
<
div
style
=
{{
paddingLeft
:
5
}}
className
=
{
selectedIndex
===
'progress-reports'
?
"active"
:
""
}
>
<
a
data
-
tip
=
{
'progress-reports'
}
data
-
for
=
{
'progress-reports'
}
>
<
ListItem
button
key
=
{
'progress-reports'
}
onClick
=
{()
=>
selectIndex
(
'progress-reports'
)}
>
<
ListItemIcon
style
=
{{
minWidth
:
open
?
40
:
56
}}
><
ReportIcon
style
=
{{
marginLeft
:
-
5
}}
/></
ListItemIcon
>
<
Typography
style
=
{{
fontFamily
:
'Nunito Sans, sans-serif'
,
color
:
'#525355'
,
fontSize
:
14
}}
>
{
'Progress Report'
}
<
/Typography
>
<
/ListItem
>
<
/a
>
{
!
open
&&
(
<
ReactTooltip
border
=
{
true
}
id
=
{
'Progress Report'
}
place
=
"bottom"
type
=
"light"
effect
=
"solid"
/>
)}
<
/div
>
<
/Link
>
<
/List
>
{
open
&&
setting
.
length
>
0
&&
<
div
style
=
{{
marginLeft
:
20
}}
>
...
...
src/container/ProgressReport.js
0 → 100644
View file @
a74cf8a7
This diff is collapsed.
Click to expand it.
src/router/homeRoutes.js
View file @
a74cf8a7
...
...
@@ -20,6 +20,7 @@ import OutlookPA from '../container/OutlookPA';
import
SubHolding
from
'../container/Laporan/SubHolding'
;
import
SummaryTriputra
from
'../container/SummaryTriputra/SummaryOfTriputra'
;
import
MasterDataCAT
from
'../container/MasterData/MasterDataCAT/MasterDataCAT'
import
ProgressReport
from
'../container/ProgressReport'
const
routes
=
[
{
...
...
@@ -106,6 +107,10 @@ const routes = [
path
:
"/home/dashboard-financial"
,
main
:
DashboardFinancial
},
{
path
:
"/home/progress-reports"
,
main
:
ProgressReport
},
{
path
:
"*"
,
main
:
screen404
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment