P300021
/
poli_planning
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix max hours available with more then one medic

This commit is contained in:
Joshua Rubingh 2020-05-19 17:03:57 +02:00
parent 2cd502caa5
commit 66a2aab6b7
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
polyclinic_scheduling/apps/RUG_template/static/RUG_template/javascript/moment-with-locales.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

9
polyclinic_scheduling/apps/RUG_template/templates/base.html
View File

@ -25,11 +25,6 @@
<meta content="#cc0000" name="msapplication-TileColor">
<meta content="https://www.rug.nl/mstile-144x144.png" name="msapplication-TileImage">
<meta content="user-scalable=1, initial-scale=1.0" name="viewport">
{% comment %}
<script type="text/javascript">
var alertsHref = "";
</script>
{% endcomment %}
<script src="https://www.rug.nl/_definition/shared/js/jquery.js?version=2019-12-12" type="text/javascript"></script>
<script type="text/javascript">jQuery.noConflict();</script>
@ -51,6 +46,7 @@
<script type="text/javascript" src="https://www.rug.nl/_definition/shared/js/cross-frame.js?version=2019-12-12"></script>
<link href="{% static 'RUG_template/css/base.css' %}" rel="stylesheet"/>
<script type="text/javascript" src="{% static 'RUG_template/javascript/moment-with-locales.min.js' %}"></script>
</head>
<body itemtype="http://schema.org/WebPage" itemscope="itemscope" id="top" class="page--topicpage"><!--googleoff: all-->
@ -90,6 +86,9 @@
{% get_current_language as LANGUAGE_CODE %}
{% get_available_languages as LANGUAGES %}
{% get_language_info_list for LANGUAGES as languages %}
<script>
moment.locale('{{LANGUAGE_CODE}}');
</script>
<input name="next" type="hidden" value="{% if redirect_to %}{{ redirect_to }}{% endif %}">
<input type="hidden" name="language" id="language" value="{{LANGUAGE_CODE}}">
{% for language in languages %}

8
polyclinic_scheduling/apps/schedule/templates/schedule/schedule_new.html
View File

@ -677,7 +677,7 @@
behandelingen[specialisme] = {
name : element.find('input[name^="specialisatie_"]').val(),
artsen : element.find('input[name^="specialisatie_aantal_artsen_"]').val(),
artsen : element.find('input[name^="specialisatie_aantal_artsen_"]').val() * 1,
max_time : 0,
used_time : 0
};
@ -791,13 +791,13 @@
message.html('')
jQuery.each(behandelingen,function(specialisme,obj){
if (obj.max_time - obj.used_time < 0) {
if ((obj.artsen * obj.max_time) - obj.used_time < 0) {
error = true;
message.append(jQuery('<div>').addClass('alert-danger').html('<strong>' + specialisme + ' </strong>: Te veel behandelingen voor het aantal arsten en werktijd. ' + (obj.used_time - obj.max_time) + ' Minuten teveel.'));
message.append(jQuery('<div>').addClass('alert-danger').html('<strong>' + specialisme + ' </strong>: Te veel behandelingen voor het aantal arsten en werktijd. ' + moment.duration(obj.used_time - (obj.artsen * obj.max_time),'minutes').humanize() + ' teveel.'));
} else if (obj.max_time - obj.used_time == 0) {
message.append(jQuery('<div>').addClass('alert-success').html('<strong>' + specialisme + ' </strong>: Perfect! Alle tijd is ingedeeld.'));
} else {
message.append(jQuery('<div>').addClass('alert-warning').html('<strong>' + specialisme + ' </strong>: Uw heeft nog ' + (obj.max_time - obj.used_time) + ' minuten tijd over voor meer afspraken.'));
message.append(jQuery('<div>').addClass('alert-warning').html('<strong>' + specialisme + ' </strong>: Uw heeft nog ' + moment.duration((obj.artsen * obj.max_time) - obj.used_time,'minutes').humanize() + ' tijd over voor meer afspraken.'));
}
});