Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
pvk-tool
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
13
Issues
13
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
amiv
pvk-tool
Commits
d0108f0a
Commit
d0108f0a
authored
Dec 02, 2017
by
Alexander Dietmüller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Frontend: Integrate actual API requests into CourseView
parent
1e2deb32
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
109 deletions
+22
-109
Frontend/src/CourseList.js
Frontend/src/CourseList.js
+22
-19
Frontend/src/Pvk.js
Frontend/src/Pvk.js
+0
-56
Frontend/src/PvkList.js
Frontend/src/PvkList.js
+0
-34
No files found.
Frontend/src/CourseList.js
View file @
d0108f0a
import
PvkList
from
'
./PvkList
'
;
const
m
=
require
(
'
mithril
'
);
const
{
Courses
,
UserCourses
}
=
require
(
'
./api.js
'
);
const
{
Courses
}
=
require
(
'
./api.js
'
);
module
.
exports
=
{
oninit
()
{
Courses
.
load
();
},
view
()
{
<<<<<<<
HEAD
return
m
(
'
div
'
,
[
m
(
PvkList
)]);
=======
// return m('div', 'Hellooo!');
return
m
(
'
ul
'
,
[
Courses
.
list
.
map
(
course
=>
m
(
'
li
'
,
[
m
(
'
p
'
,
`
${
course
.
lecture
.
title
}
,
${
course
.
assistant
}
`
),
m
(
'
button
'
,
{
onclick
()
{
UserCourses
.
select
(
course
);
}
},
'
Add Course
'
,
),
])),
return
m
(
'
table
'
,
[
m
(
'
thead
'
,
[
m
(
'
tr
'
,
[
m
(
'
th
'
,
'
Course
'
),
m
(
'
th
'
,
'
Department
'
),
m
(
'
th
'
,
'
Name
'
),
m
(
'
th
'
,
'
Starting time
'
),
m
(
'
th
'
,
'
Ending time
'
),
]),
]),
m
(
'
tbody
'
,
Courses
.
list
.
map
(
course
=>
m
(
'
tr
'
,
[
m
(
'
td
'
,
course
.
lecture
.
title
),
m
(
'
td
'
,
course
.
lecture
.
department
),
m
(
'
td
'
,
course
.
assistant
.
name
),
course
.
datetimes
.
map
(
timeslot
=>
[
m
(
'
td
'
,
timeslot
.
start
),
m
(
'
td
'
,
timeslot
.
end
),
]),
m
(
'
td
'
,
m
(
'
button
'
,
'
add course
'
)),
]))),
]);
// m('button', { onclick() { Courses.select(); } }, 'Add Course');
>>>>>>>
Frontend
:
Talk
to
backend
and
display
courses
in
sidebar
},
};
Frontend/src/Pvk.js
deleted
100644 → 0
View file @
1e2deb32
import
m
from
'
mithril
'
;
class
Pvk
{
constructor
()
{
this
.
list
=
[];
}
loadlist
()
{
// todo: this is just a mock request and has to be replaced with the proper one
// request is needed to force mithrijs to update shared objects
m
.
request
({
method
:
'
GET
'
,
// url: `${apiUrl}`,
}).
then
(()
=>
{
this
.
list
=
[{
lecture
:
{
title
:
'
lecture1
'
,
department
:
'
depart1
'
,
year
:
17
,
},
assistant
:
{
nethz
:
'
nethzmail
'
,
name
:
'
assi name
'
,
},
datetimes
:
[{
start
:
'
2017-10-15T16:15:20Z
'
,
end
:
'
2017-10-16T16:15:20Z
'
,
}],
spots
:
15
,
selected
:
true
,
reserved
:
true
,
payed
:
true
,
},
{
lecture
:
{
title
:
'
lecture1
'
,
department
:
'
depart1
'
,
year
:
17
,
},
assistant
:
{
nethz
:
'
nethzmail
'
,
name
:
'
assi name
'
,
},
datetimes
:
[{
start
:
'
2017-10-15T16:15:20Z
'
,
end
:
'
2017-10-16T16:15:20Z
'
,
}],
spots
:
15
,
selected
:
false
,
reserved
:
false
,
payed
:
false
,
}];
});
}
}
export
default
new
Pvk
();
Frontend/src/PvkList.js
deleted
100644 → 0
View file @
1e2deb32
import
m
from
'
mithril
'
;
import
Pvk
from
'
./Pvk
'
;
module
.
exports
=
{
oninit
()
{
Pvk
.
loadlist
();
m
.
redraw
();
},
view
()
{
return
m
(
'
table
'
,
[
m
(
'
thead
'
,
[
m
(
'
tr
'
,
[
m
(
'
th
'
,
'
Course
'
),
m
(
'
th
'
,
'
Department
'
),
m
(
'
th
'
,
'
Name
'
),
m
(
'
th
'
,
'
Starting time
'
),
m
(
'
th
'
,
'
Ending time
'
),
]),
]),
m
(
'
tbody
'
,
Pvk
.
list
.
map
(
pvk
=>
m
(
'
tr
'
,
[
m
(
'
td
'
,
pvk
.
lecture
.
title
),
m
(
'
td
'
,
pvk
.
lecture
.
department
),
m
(
'
td
'
,
pvk
.
assistant
.
name
),
pvk
.
datetimes
.
map
(
timeslot
=>
[
m
(
'
td
'
,
timeslot
.
start
),
m
(
'
td
'
,
timeslot
.
end
),
]),
m
(
'
td
'
,
m
(
'
button
'
,
'
add course
'
)),
]))),
]);
},
};
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