Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
scheduling-system
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
SMASCH
scheduling-system
Commits
0753042f
There was a problem fetching the pipeline metadata.
Commit
0753042f
authored
7 years ago
by
Valentin Groues
Browse files
Options
Downloads
Patches
Plain Diff
add datepicker for daily planning
#208
parent
ca399839
No related branches found
No related tags found
1 merge request
!131
Resolve "add possibility to select date in daily planning"
Pipeline
#
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
smash/web/static/js/daily_planning.js
+17
-1
17 additions, 1 deletion
smash/web/static/js/daily_planning.js
smash/web/templates/daily_planning.html
+2
-0
2 additions, 0 deletions
smash/web/templates/daily_planning.html
with
19 additions
and
1 deletion
smash/web/static/js/daily_planning.js
+
17
−
1
View file @
0753042f
...
@@ -237,6 +237,22 @@ $(document).ready(function () {
...
@@ -237,6 +237,22 @@ $(document).ready(function () {
groupByResource
:
true
,
groupByResource
:
true
,
height
:
"
auto
"
,
height
:
"
auto
"
,
customButtons
:
{
customButtons
:
{
datePickerButton
:
{
text
:
'
select
'
,
click
:
function
()
{
var
$btnCustom
=
$
(
'
.fc-datePickerButton-button
'
);
if
(
$
(
"
.calendar-datepicker
"
).
length
>
0
)
{
$
(
"
.calendar-datepicker
"
).
remove
();
}
else
{
$btnCustom
.
after
(
'
<div class="calendar-datepicker"/>
'
);
$
(
"
.calendar-datepicker
"
).
datepicker
().
on
(
'
changeDate
'
,
function
(
ev
)
{
$
(
'
#calendar
'
).
fullCalendar
(
'
gotoDate
'
,
ev
.
date
);
$
(
"
.calendar-datepicker
"
).
remove
();
});
}
}
},
save
:
{
save
:
{
text
:
'
Save
'
,
text
:
'
Save
'
,
click
:
function
()
{
click
:
function
()
{
...
@@ -333,7 +349,7 @@ $(document).ready(function () {
...
@@ -333,7 +349,7 @@ $(document).ready(function () {
},
},
header
:
{
header
:
{
left
:
'
prev,next today
'
,
left
:
'
prev,next today
'
,
center
:
'
title
'
,
center
:
'
title
, datePickerButton
'
,
right
:
'
save, clear, toPdf
'
right
:
'
save, clear, toPdf
'
},
},
droppable
:
true
,
droppable
:
true
,
...
...
This diff is collapsed.
Click to expand it.
smash/web/templates/daily_planning.html
+
2
−
0
View file @
0753042f
...
@@ -13,6 +13,7 @@
...
@@ -13,6 +13,7 @@
/>
/>
<link
rel=
"stylesheet"
href=
"{% static 'fullcalendar-scheduler/scheduler.min.css' %}"
>
<link
rel=
"stylesheet"
href=
"{% static 'fullcalendar-scheduler/scheduler.min.css' %}"
>
<link
rel=
"stylesheet"
href=
"{% static 'css/daily_planning.css' %}"
>
<link
rel=
"stylesheet"
href=
"{% static 'css/daily_planning.css' %}"
>
{% include "includes/datepicker.css.html" %}
{% endblock styles %}
{% endblock styles %}
{% block ui_active_tab %}'daily_planning'{% endblock ui_active_tab %}
{% block ui_active_tab %}'daily_planning'{% endblock ui_active_tab %}
...
@@ -48,6 +49,7 @@
...
@@ -48,6 +49,7 @@
var
resources_url
=
'
{% url
'
web
.
api
.
workers
'
%}
'
;
var
resources_url
=
'
{% url
'
web
.
api
.
workers
'
%}
'
;
var
events_url
=
'
{% url
'
web
.
api
.
events_persist
'
%}
'
;
var
events_url
=
'
{% url
'
web
.
api
.
events_persist
'
%}
'
;
</script>
</script>
{% include "includes/datepicker.js.html" %}
<script
src=
"{% static 'js/daily_planning.js' %}"
></script>
<script
src=
"{% static 'js/daily_planning.js' %}"
></script>
<script
src=
"{% static 'jspdf.min.js' %}"
></script>
<script
src=
"{% static 'jspdf.min.js' %}"
></script>
<script
src=
"{% static 'html2canvas/html2canvas.min.js' %}"
></script>
<script
src=
"{% static 'html2canvas/html2canvas.min.js' %}"
></script>
...
...
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