Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
scientia
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Zhige Yu
scientia
Commits
b4295017
Commit
b4295017
authored
4 years ago
by
danieldeng2
Browse files
Options
Downloads
Patches
Plain Diff
Dynamically generate the number of weeks
parent
97ba11b9
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/components/pages/Timeline/index.tsx
+25
-16
25 additions, 16 deletions
src/components/pages/Timeline/index.tsx
src/components/pages/Timeline/style.module.scss
+0
-2
0 additions, 2 deletions
src/components/pages/Timeline/style.module.scss
src/utils/functions.ts
+8
-2
8 additions, 2 deletions
src/utils/functions.ts
with
33 additions
and
20 deletions
src/components/pages/Timeline/index.tsx
+
25
−
16
View file @
b4295017
...
...
@@ -6,6 +6,7 @@ import ModuleHeading from "./components/ModuleHeading";
import
WeekHeading
from
"
./components/WeekHeading
"
;
import
{
modulesList
}
from
"
../ModuleList/list
"
;
import
classNames
from
"
classnames
"
;
import
{
addDays
}
from
"
utils/functions
"
;
interface
TimelineProps
{
initSideBar
:
()
=>
void
;
...
...
@@ -23,6 +24,7 @@ type ModuleTracks = {
interface
TimelineState
{
moduleTracks
:
ModuleTracks
;
}
class
Timeline
extends
React
.
Component
<
TimelineProps
,
TimelineState
>
{
constructor
(
props
:
TimelineProps
)
{
super
(
props
);
...
...
@@ -42,18 +44,7 @@ class Timeline extends React.Component<TimelineProps, TimelineState> {
this
.
props
.
revertSideBar
();
}
addDays
(
date
:
Date
,
days
:
number
)
{
let
result
=
new
Date
(
date
);
result
.
setDate
(
result
.
getDate
()
+
days
);
return
result
;
}
render
()
{
const
termStart
=
new
Date
(
"
2020-09-28
"
);
const
activeDay
=
new
Date
(
"
2020-10-07
"
);
const
numWeeks
=
12
;
const
trackHeight
=
4.25
;
generateGridItems
(
numWeeks
:
number
,
trackHeight
:
number
)
{
let
timelineBackgrounds
:
ReactElement
[]
=
[];
let
moduleHeadings
:
ReactElement
[]
=
[];
...
...
@@ -89,6 +80,18 @@ class Timeline extends React.Component<TimelineProps, TimelineState> {
}
}
}
return
[
moduleHeadings
,
timelineBackgrounds
];
}
render
()
{
const
termStart
=
new
Date
(
"
2020-09-28
"
);
const
activeDay
=
new
Date
(
"
2020-10-07
"
);
const
numWeeks
=
11
;
const
trackHeight
=
4.25
;
const
[
moduleHeadings
,
timelineBackgrounds
]
=
this
.
generateGridItems
(
numWeeks
,
trackHeight
);
return
(
<
div
className
=
{
styles
.
timelineContainer
}
>
<
MyBreadcrumbs
/>
...
...
@@ -96,20 +99,26 @@ class Timeline extends React.Component<TimelineProps, TimelineState> {
<
div
className
=
{
styles
.
timelineTermSwitcher
}
>
<
TermSwitcher
/>
</
div
>
<
div
className
=
{
styles
.
timelineWeekRow
}
>
<
div
className
=
{
styles
.
timelineWeekRow
}
style
=
{
{
gridTemplateColumns
:
`repeat(
${
numWeeks
}
, 15rem)`
}
}
>
{
[...
Array
(
numWeeks
)].
map
((
_
,
i
)
=>
(
<
div
className
=
{
styles
.
weekHeading
}
key
=
{
i
}
>
<
WeekHeading
weekNumber
=
{
i
+
1
}
dateRangeStart
=
{
this
.
addDays
(
termStart
,
i
*
7
)
}
dateRangeEnd
=
{
this
.
addDays
(
termStart
,
i
*
7
+
4
)
}
dateRangeStart
=
{
addDays
(
termStart
,
i
*
7
)
}
dateRangeEnd
=
{
addDays
(
termStart
,
i
*
7
+
4
)
}
activeDay
=
{
activeDay
}
/>
</
div
>
))
}
</
div
>
<
div
className
=
{
styles
.
timelineModuleColumn
}
>
{
moduleHeadings
}
</
div
>
<
div
className
=
{
styles
.
timelineWeekBackground
}
>
<
div
className
=
{
styles
.
timelineWeekBackground
}
style
=
{
{
gridTemplateColumns
:
`repeat(
${
numWeeks
}
, 15rem)`
}
}
>
{
timelineBackgrounds
}
</
div
>
</
div
>
...
...
This diff is collapsed.
Click to expand it.
src/components/pages/Timeline/style.module.scss
+
0
−
2
View file @
b4295017
...
...
@@ -69,7 +69,6 @@
grid-area
:
weeks
;
display
:
grid
;
grid-auto-flow
:
row
;
grid-template-columns
:
repeat
(
12
,
15rem
);
grid-gap
:
0
.625rem
;
padding-right
:
0
.625rem
;
top
:
0
;
...
...
@@ -96,7 +95,6 @@
.timelineWeekBackground
{
display
:
grid
;
grid-area
:
background
;
grid-template-columns
:
repeat
(
12
,
15rem
);
grid-template-rows
:
auto
;
column-gap
:
0
.625rem
;
row-gap
:
0
;
...
...
This diff is collapsed.
Click to expand it.
src/utils/functions.ts
+
8
−
2
View file @
b4295017
...
...
@@ -3,5 +3,11 @@ export function titleCase(string: string) {
for
(
var
i
=
0
;
i
<
sentence
.
length
;
i
++
)
{
sentence
[
i
]
=
sentence
[
i
][
0
].
toUpperCase
()
+
sentence
[
i
].
slice
(
1
);
}
return
sentence
.
join
(
'
'
);
}
\ No newline at end of file
return
sentence
.
join
(
"
"
);
}
export
function
addDays
(
date
:
Date
,
days
:
number
)
{
let
result
=
new
Date
(
date
);
result
.
setDate
(
result
.
getDate
()
+
days
);
return
result
;
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment