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
c32ff9d9
Commit
c32ff9d9
authored
8 months ago
by
Valentin Groues
Browse files
Options
Downloads
Plain Diff
Merge branch 'fix/availabilities' into 'master'
fix: convert date (str) to datetime on api endpoint See merge request
!460
parents
d7a36120
0574ba6a
No related branches found
No related tags found
1 merge request
!460
fix: convert date (str) to datetime on api endpoint
Pipeline
#95182
passed
4 months ago
Stage: test
Changes
3
Pipelines
106
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG
+3
-0
3 additions, 0 deletions
CHANGELOG
smash/web/api_views/daily_planning.py
+1
-0
1 addition, 0 deletions
smash/web/api_views/daily_planning.py
smash/web/templates/_base.html
+1
-1
1 addition, 1 deletion
smash/web/templates/_base.html
with
5 additions
and
1 deletion
CHANGELOG
+
3
−
0
View file @
c32ff9d9
smasch (1.4.4-1) stable; urgency=high
* fix bug in api/availabilities endpoint
smasch (1.4.3-1) stable; urgency=medium
* make export faster
* make API endpoint /api/subjects/GENERIC faster
...
...
This diff is collapsed.
Click to expand it.
smash/web/api_views/daily_planning.py
+
1
−
0
View file @
c32ff9d9
...
...
@@ -465,6 +465,7 @@ def get_workers_for_daily_planning(request: HttpRequest):
def
availabilities
(
request
,
date
):
date
=
datetimeify_date
(
date
)
result_availabilities
=
[]
holidays
=
[]
conflicts
=
[]
...
...
This diff is collapsed.
Click to expand it.
smash/web/templates/_base.html
+
1
−
1
View file @
c32ff9d9
...
...
@@ -258,7 +258,7 @@ desired effect
{% block footer %}
<!-- To the right -->
<div
class=
"pull-right hidden-xs"
>
Version:
<strong>
1.4.
3
</strong>
Version:
<strong>
1.4.
4
</strong>
</div>
<!-- Default to the left -->
...
...
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