Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
m4lab_tv1
User Account
Commits
3305a23c
Commit
3305a23c
authored
5 years ago
by
Rosanny Sihombing
Browse files
Options
Download
Email Patches
Plain Diff
update Contact, Term and Category
parent
948a3d35
master
MLAB-677
devel
devel_wolfgang
patch-1
reset-jul13
reset-merge
test_logoutbutton
testing
1 merge request
!2
Mlab 56
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
routes/routes-project.js
+12
-5
routes/routes-project.js
views/DE/project/addProjectOverview.pug
+46
-20
views/DE/project/addProjectOverview.pug
with
58 additions
and
25 deletions
+58
-25
routes/routes-project.js
+
12
-
5
View file @
3305a23c
...
...
@@ -106,6 +106,7 @@ module.exports = function (app) {
if
(
req
.
body
.
wiki
)
wiki
=
1
var
projectTerm
=
req
.
body
.
termForm
+
"
-
"
+
req
.
body
.
termTo
var
projectOverviewData
=
{
pname
:
req
.
body
.
pname
,
title
:
req
.
body
.
title
,
...
...
@@ -120,16 +121,14 @@ module.exports = function (app) {
result
:
req
.
body
.
result
,
keywords
:
req
.
body
.
keywords
,
announcement
:
req
.
body
.
announcement
,
term
:
req
.
body
.
t
erm
,
term
:
projectT
erm
,
further_details
:
req
.
body
.
furtherDetails
,
website
:
req
.
body
.
website
,
src
:
req
.
body
.
src
,
caption
:
req
.
body
.
caption
,
contact_firstname
:
req
.
body
.
contactFirstname
,
contact_lastname
:
req
.
body
.
contactLastname
,
contact_lastname
:
req
.
body
.
contactName
,
contact_email
:
req
.
body
.
contactEmail
,
leader_firstname
:
req
.
body
.
leaderFirstname
,
leader_lastname
:
req
.
body
.
leaderLastname
,
leader_lastname
:
req
.
body
.
leaderName
,
leader_email
:
req
.
body
.
leaderEmail
}
...
...
@@ -146,5 +145,13 @@ module.exports = function (app) {
})
}
})
app
.
get
(
'
/updateprojectoverview
'
,
function
(
req
,
res
)
{
// only their own project
})
app
.
post
(
'
/updateprojectoverview
'
,
function
(
req
,
res
)
{
// only their own project
})
};
\ No newline at end of file
This diff is collapsed.
Click to expand it.
views/DE/project/addProjectOverview.pug
+
46
-
20
View file @
3305a23c
...
...
@@ -6,6 +6,8 @@ html(lang="de")
meta(name="viewport", content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no")
link(rel="stylesheet", type="text/css", href="https://transfer.hft-stuttgart.de/css/bootstrap/bootstrap.css")
link(rel="stylesheet", href="https://use.fontawesome.com/releases/v5.8.2/css/all.css", integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay", crossorigin="anonymous")
// jQuery UI - Datepicker
link(rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css")
style.
.collapse {
display: none;
...
...
@@ -49,8 +51,15 @@ html(lang="de")
input#inputTitle(name="title" class="form-control" type="text" placeholder="official title of the project*" required)
div(class="form-group col-md-12")
input#inputSummary(name="summary" class="form-control" type="text" placeholder="one line summary of the project")
div(class="form-group col-md-12")
//
div(class="form-group col-md-12")
input#inputCategory(name="category" class="form-control" type="text" placeholder="category of the project")
div(class='form-group col-md-12')
select#inputCategory(name="category", class="form-control")
option(value="") - select a category -
option(value="Experten-Gruppe") Experten-Gruppe
option(value="Student-Projekt") Student-Projekt
option(value="Lehr Projekt") Lehr Projekt
option(value="Transfer-projekt") Transfer-projekt
div(class="form-group col-md-12")
input#inputLogo(name="logo" class="form-control" type="text" placeholder="official logo of the project")
div(class="form-group col-md-12")
...
...
@@ -64,13 +73,13 @@ html(lang="de")
h5(class="mb-3 font-weight-bold") Content
div(class='form-row')
div(class='form-group col-md-12')
textarea#inputOverview(name="overview" class="form-control" type="text" rows="5" placeholder="
overview
")
textarea#inputOverview(name="overview" class="form-control" type="text" rows="5" placeholder="
Projektüberblick
")
div(class="form-group col-md-12")
textarea#inputQuestion(name="question" class="form-control" type="text" rows="5" placeholder="
question
")
textarea#inputQuestion(name="question" class="form-control" type="text" rows="5" placeholder="
Fragestellung
")
div(class='form-group col-md-12')
textarea#inputApproach(name="approach" class="form-control" type="text" rows="5" placeholder="
approach
")
textarea#inputApproach(name="approach" class="form-control" type="text" rows="5" placeholder="
Vorgehensweise
")
div(class="form-group col-md-12")
textarea#inputResult(name="result" class="form-control" type="text" rows="5" placeholder="
result
")
textarea#inputResult(name="result" class="form-control" type="text" rows="5" placeholder="
Ergebnis und Nutzung
")
div(class="form-group col-md-12")
input#inputKeywords(name="keywords" class="form-control" type="text" placeholder="keywords")
h5(class="mb-3 font-weight-bold") Info
...
...
@@ -78,7 +87,13 @@ html(lang="de")
div(class='form-group col-md-12')
textarea#inputAnnouncement(name="announcement" class="form-control" type="text" rows="5" placeholder="Ausschreibung")
div(class="form-group col-md-12")
input#inputTerm(name="term" class="form-control" type="text" placeholder="Laufzeit")
div(class='form-row')
div(class="form-group col-md-2")
<p class="font-weight-normal">Laufzeit</p>
div(class="form-group col-md-5")
input#inputTermFrom(name="termForm" class="form-control" type="text" placeholder="von (dd.mm.yyyy)")
div(class="form-group col-md-5")
input#inputTermTo(name="termTo" class="form-control" type="text" placeholder="bis (dd.mm.yyyy)")
div(class='form-group col-md-12')
textarea#inputFurtherDetails(name="furtherDetails" class="form-control" type="text" rows="5" placeholder="Mehr informationen")
div(class="form-group col-md-12")
...
...
@@ -89,27 +104,38 @@ html(lang="de")
input#inputSrc(name="src" class="form-control" type="text" placeholder="link to the image source")
div(class="form-group col-md-12")
input#inputCaption(name="caption" class="form-control" type="text" placeholder="caption of the image")
h5(class="mb-3 font-weight-bold")
C
onta
c
t
h5(class="mb-3 font-weight-bold")
K
onta
k
t
div(class='form-row')
div(class="form-group col-md-
4
")
input#inputContactFirstname(name="contactFirstname" class="form-control" type="text" placeholder="contact firstname")
div(class="form-group col-md-
4
")
input#inputContact
Lastn
ame(name="contact
Lastn
ame" class="form-control" type="text" placeholder="
contact last
name")
div(class="form-group col-md-
4
")
input#inputContactEmail(name="contactEmail" class="form-control" type="email" placeholder="
contact email
")
div(class="form-group col-md-
4
")
input#inputLeaderFirstname(name="leaderFirstname" class="form-control" type="text" placeholder="leader firstname")
div(class="form-group col-md-
4
")
input#inputLeader
Lastn
ame(name="leader
Lastn
ame" class="form-control" type="text" placeholder="
leader last
name")
div(class="form-group col-md-
4
")
input#inputLeaderEmail(name="leaderEmail" class="form-control" type="email" placeholder="
leader email
")
div(class="form-group col-md-
2
")
<p class="font-weight-normal">Ansprechpartner</p>
div(class="form-group col-md-
5
")
input#inputContact
N
ame(name="contact
N
ame" class="form-control" type="text" placeholder="
Titel/Anrede Vorname Nach
name")
div(class="form-group col-md-
5
")
input#inputContactEmail(name="contactEmail" class="form-control" type="email" placeholder="
E-mail Adresse
")
div(class="form-group col-md-
2
")
<p class="font-weight-normal">Projektleitung</p>
div(class="form-group col-md-
5
")
input#inputLeader
N
ame(name="leader
N
ame" class="form-control" type="text" placeholder="
Titel/Anrede Vorname Nach
name")
div(class="form-group col-md-
5
")
input#inputLeaderEmail(name="leaderEmail" class="form-control" type="email" placeholder="
E-mail Adresse
")
p <em><small>* Pflichtfeld</small></em>
input#submitBtn(type="submit", class="btn btn-outline-dark btn-block", value="Projekt Anlegen")
// jQuery
script(src="https://code.jquery.com/jquery-3.3.1.min.js")
script(src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js", integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1", crossorigin="anonymous")
// jQuery UI - Datepicker
script(src="https://code.jquery.com/ui/1.12.1/jquery-ui.js")
script(src="/js/jquery-ui/i18n/datepicker-de.js")
//script(src="i18n/datepicker-de.js")
// Bootstrap
script(src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous")
// Header
script(src="/js/headfootLogout.js")
\ No newline at end of file
script(src="/js/headfootLogout.js")
script.
$( function() {
$.datepicker.setDefaults( $.datepicker.regional["de"] );
$("#inputTermFrom").datepicker();
//$("#inputTermTo").datepicker();
$("#inputTermTo").datepicker( $.datepicker.regional["de"] );
});
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets