Skip to content

Commit

Permalink
Réservation en bloc ; passage sous twig
Browse files Browse the repository at this point in the history
  • Loading branch information
JeromeDevome committed Nov 22, 2018
1 parent c5f4533 commit 7d109cd
Show file tree
Hide file tree
Showing 14 changed files with 743 additions and 539 deletions.
513 changes: 0 additions & 513 deletions admin/admin_calend2.php
View file

This file was deleted.

409 changes: 409 additions & 0 deletions admin/controleurs/admin_reservation_bloc.php
View file

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions admin/templates/admin_calend.twig
View file
Expand Up @@ -11,10 +11,9 @@
<div class="col-md-12">

<div class="box">
<!-- /.box-header -->
<div class="box-body no-padding">
<h4>Choisissez le type d'action à réaliser :</h4>
<a href="?p=admin_calend2" class="btn btn-primary btn-block">{{ trad.admin_calendar_title }}</a>
<a href="?p=admin_reservation_bloc" class="btn btn-primary btn-block">{{ trad.admin_calendar_title }}</a>
<br><br>
<a href="?p=admin_delete_entry_after" class="btn btn-primary btn-block">Supprimer toutes les réservations après une date donnée</a>
<a href="?p=admin_delete_entry_before" class="btn btn-primary btn-block">Supprimer toutes les réservations avant une date donnée</a>
Expand Down
309 changes: 309 additions & 0 deletions admin/templates/admin_reservation_bloc.twig
View file
@@ -0,0 +1,309 @@
{% extends 'layout.twig' %}

{% block css %}
{% endblock %}
{% import 'messagesysteme.twig' as msgSyst %}
{% import 'champs.twig' as form %}

{% block content %}
<div class="row">

<div class="col-md-12">

<div class="box">
<div class="box-header">
<h3 class="box-title">{{ trad.admin_calendar_title }}</h3>
<p class="label pull-right bg-blue">{{ trad.etape_n }} {{ trad.dEtape }}/4</p>
</div>
<!-- /.box-header -->

<div class="box-body no-padding">

{% if trad.dEtape == 1 %}

<p>{{ trad.admin_calendar_explain_1 |raw }}</p>

<form action="?p=admin_reservation_bloc" method="post">
<input type="hidden" name="p" value="admin_reservation_bloc" />
<input type="hidden" name="etape" value="2" />

<table border="1">
<tr>
<td>
<h4>{{ trad.choix_domaines }}</h4>
<select name="areas[]" multiple="multiple" class="form-control" required>
{% for domaine in domaines %}
<option value="{{ domaine.id }}">{{ domaine.nom }}</option>
{% endfor %}
</select>
<p>{{ trad.ctrl_click }}</p>
</td>
<td>
<h4>{{ trad.choix_action }}</h4>
<input type="radio" name="type_resa" value="resa" checked /> {{ trad.reservation_en_bloc }}<br>
<input type="radio" name="type_resa" value="suppression" /> {{ trad.suppression_en_bloc }}<br>
</td>
</tr>
</table>

<br><br>

<div style="text-align:center;">
<input class="btn btn-primary" type="submit" name="valider" value="{{ trad.next }}" />
</div>
</form>

{% elseif trad.dEtape == 2 %}

{% if trad.dTypeResa == 'resa' %}
<h2>{{ trad.reservation_en_bloc }}</h2>
{% else %}
<h2>{{ trad.suppression_en_bloc }}</h2>
{% endif %}

<form action="?p=admin_reservation_bloc" method="post" id="main" onsubmit="return validate_and_submit();">
<input type="hidden" name="p" value="admin_reservation_bloc" />
<input type="hidden" name="etape" value="3" />
<input type="hidden" name="type_resa" value="{{ trad.dTypeResa }}" />

{% if trad.dTypeResa == 'resa' %}
<div class="form-group col-sm-12">
<label class="col-sm-4" for="beneficiaire">{{ trad.reservation_au_nom_de }}</label>
<div class="col-sm-8">
<select name="beneficiaire" class="form-control" required>
{% for beneficiaire in beneficiaires %}
<option value="{{ beneficiaire.id }}" {% if beneficiaire.select == 1 %}selected{% endif %}>{{ beneficiaire.nom }} {{ beneficiaire.prenom }}</option>
{% endfor %}
</select>
</div>

<br><br>

{{ form.input('name', trad.namebooker, '', {classGroup: 'col-sm-12', classLabel: 'col-sm-4', classInput: 'col-sm-8 control-label', require:1}) }}
{{ form.textarea('description', trad.fulldescription, '', {classGroup: 'col-sm-12', classLabel: 'col-sm-4', classInput: 'col-sm-8 control-label'}) }}

{% endif %}

<div class="form-group col-sm-12">
<label class="col-sm-4" for="rooms">{{ trad.rooms }}</label>
<div class="col-sm-8">
<select name="rooms[]" class="form-control" multiple required>
{% for ressource in ressources %}
<option value="{{ ressource.id }}">{{ ressource.nom }}</option>
{% endfor %}
</select>
<p>{{ trad.ctrl_click }}</p>
</div>

{% if trad.dTypeResa == 'resa' %}
<div class="form-group col-sm-12">
<label class="col-sm-4" for="type_">{{ trad.type }}</label>
<div class="col-sm-8">
<select name="type_" class="form-control" required>
{% for type in types %}
<option value="0">{{ trad.choose }}</option>
<option value="{{ type.id }}" {% if type.select == 1 %}selected{% endif %}>{{ type.nom }}</option>
{% endfor %}
</select>
</div>
{% endif %}

<br><br>

<div style="text-align:center;">
<input class="btn btn-primary" type="submit" name="valider" value="{{ trad.next }}" />
</div>
</form>

{% elseif trad.dEtape == 3 %}

{% if trad.dTypeResa == 'resa' %}
<h2>{{ trad.reservation_en_bloc }}</h2>
{% else %}
<h2>{{ trad.suppression_en_bloc }}</h2>
{% endif %}

<form action="?p=admin_reservation_bloc" method="post" id="formulaire">

<div class="row">
<div class="col-md-8">
<table cellpadding="3" width="100%" border="0">
{% for jour in jourssemaines %}
<tr>
<td><span class="small"><a href="?p=admin_reservation_bloc" onclick="setCheckboxesGrr(document.getElementById('formulaire'), true, '{{ jour }}'); return false;">{{ trad.check_all_the }} {{ jour }}s</a></span></td>
<td><span class="small"><a href="?p=admin_reservation_bloc" onclick="setCheckboxesGrr(document.getElementById('formulaire'), false, '{{ jour }}' ); return false;">{{ trad.uncheck_all_the }} {{ jour }}s</a></span></td>
</tr>
{% endfor %}
<tr>
<td><span class="small"><a href="?p=admin_calend_jour_cycle2" onclick="setCheckboxesGrr(document.getElementById('formulaire'), false, 'all'); return false;">{{ trad.uncheck_all_ }}</a></span></td>
</tr>
</table>
</div>

<!-- Partie selection horaire -->
<div class="col-md-4">
<p><b>{{ trad.date }} {{ trad.deux_points }}</b></p>

{% if trad.dPeriode == 'y' %}

<p>{{ trad.period }}</p>
<select name="period">
{% for periode in periodes %}
<option value="{{ periode.num }}">{{ periode.val }}</option>
{% endfor %}
</select>

<p><b>{{ trad.fin_reservation }} {{ trad.deux_points }}</b></p>
<p>{{ trad.period }}</p>
<select name="end_period">
{% for periode in periodes %}
<option value="{{ periode.num }}">{{ periode.val }}</option>
{% endfor %}
</select>


{% elseif trad.dPeriode == 'n' %}

<p>
{{ trad.time }}
<input name="hour" size="2" value="{{ trad.dDebutJournee }}" maxlength="2" /> h
<input name="minute" size="2" value="0" maxlength="2" />
</p>

<p><b>{{ trad.fin_reservation }} {{ trad.deux_points }}</b></p>
<p>
{{ trad.time }}
<input name="end_hour" size="2" maxlength="2" required /> h
<input name="end_minute" size="2" value="0" maxlength="2" />
</p>

{% else %}

<input type="hidden" name="all_day" value="y" />
<p>{{ trad.domaines_de_type_incompatibles }}</p>

{% endif %}

</div>
</div>

<input type="hidden" name="p" value="admin_reservation_bloc" />
<input type="hidden" name="etape" value="4" />
<input type="hidden" name="type_resa" value="{{ trad.dTypeResa }}" />
<input type="hidden" name="record" value="yes" />
<input type="hidden" name="name" value="{{ trad.dName }}" />
<input type="hidden" name="description" value="{{ trad.dDescription }}" />
<input type="hidden" name="beneficiaire" value="{{ trad.dBeneficiaire }}" />
<input type="hidden" name="type_" value="{{ trad.dType }}" />
{% for ressource in ressources %}
<input type="hidden" name="id_room_{{ ressource.id }}" value="yes" />
{% endfor %}

<table cellspacing="20">
{{ trad.dCalendrier |raw }}
</table>


<div style="text-align:center;">
<input class="btn btn-primary" type="submit" name="valider" value="{{ trad.save }}" />
</div>

</form>

{% elseif trad.dEtape == 4 %}

{% if trad.dTypeResa == 'resa' %}
<h3>{{ trad.reservation_en_bloc }}</h3>
<h2>{{ trad.reservation_en_bloc_result }}</h2>
{% if trad.dResult != 0 %}
<p>{{ trad.reservation_en_bloc_result2 }} {{ trad.dResult }}</p>
{% endif %}
{% else %}
<h3>{{ trad.suppression_en_bloc }}</h3>
<h2>{{ trad.suppression_en_bloc_result }} {{ trad.dResult }}</h2>
{% endif %}

{% endif %}

</div>
</div>
</div>
</div>

{% endblock %}

{% block javascript %}
{% if trad.dEtape == 2 %}
{% if trad.dTypeResa == 'resa' %}
<script type="text/javascript">
function validate_and_submit ()
{
if (document.getElementById("main").name.value == "")
{
alert ( "{{ trad.you_have_not_entered }} \n {{ trad.brief_description }}");
return false;
}
else if (document.getElementById("main").elements[3].value == '')
{
alert("{{ trad.choose_a_room }}");
return false;
}
else if (document.getElementById("main").type_.value == '0')
{
alert("{{ trad.choose_a_type }}");
return false;
}
else
return true;
}
</script>
{% else %}
<script type="text/javascript">
function validate_and_submit ()
{
if (document.getElementById("main").elements[0].value == '')
{
alert("{{ trad.choose_a_room }}"); ?>");
return false;
}
else
return true;
}
</script>
{% endif %}
{% elseif trad.dEtape == 3 %}
<script type="text/javascript">
function setCheckboxesGrr(elts, do_check, day)
{
for (i = 0; i < elts.length; i++)
{
type = elts.type;
if (type="checkbox")
{
if ((elts[i].value== day) || (day=='all'))
{
elts[i].checked = do_check;
}
}
}
return true;
}
function setCheckboxesGrrName(elts, do_check, day)
{
for (i = 0; i < elts.length; i++)
{
type = elts.type;
if (type="checkbox")
{
if (elts[i].name== day)
{
elts[i].checked = do_check;
}
}
}
return true;
}
</script>
{% endif %}
{% endblock %}
4 changes: 2 additions & 2 deletions day.php
View file
Expand Up @@ -145,7 +145,7 @@
{
$today[$row['0']][$am7]["data"] = affichage_lien_resa_planning($row['3'], $row['4']);
if ($settings->get("display_info_bulle") == 1)
$today[$row['0']][$am7]["who"] = get_vocab("reservation au nom de").affiche_nom_prenom_email($row['6'], $row['11'], "nomail");
$today[$row['0']][$am7]["who"] = get_vocab("reservation_au_nom_de").affiche_nom_prenom_email($row['6'], $row['11'], "nomail");
else if ($settings->get("display_info_bulle") == 2)
$today[$row['0']][$am7]["who"] = $row['8'];
else
Expand All @@ -155,7 +155,7 @@
{
$today[$row['0']][$start_t]["data"] = affichage_lien_resa_planning($row['3'], $row['4']);
if ($settings->get("display_info_bulle") == 1)
$today[$row['0']][$start_t]["who"] = get_vocab("reservation au nom de").affiche_nom_prenom_email($row['6'], $row['11']);
$today[$row['0']][$start_t]["who"] = get_vocab("reservation_au_nom_de").affiche_nom_prenom_email($row['6'], $row['11']);
else if ($settings->get("display_info_bulle") == 2)
$today[$row['0']][$start_t]["who"] = $row['8'];
else
Expand Down
2 changes: 1 addition & 1 deletion edit_entry.php
View file
Expand Up @@ -700,7 +700,7 @@ function changeRooms( formObj )
$flag_qui_peut_reserver_pour = "yes";
echo '<tr>'.PHP_EOL;
echo '<td class="E">'.PHP_EOL;
echo '<b>'.ucfirst(trim(get_vocab("reservation au nom de"))).get_vocab("deux_points").'</b>'.PHP_EOL;
echo '<b>'.ucfirst(trim(get_vocab("reservation_au_nom_de"))).get_vocab("deux_points").'</b>'.PHP_EOL;
echo '</td>'.PHP_EOL;
echo '</tr>'.PHP_EOL;
echo '<tr>'.PHP_EOL;
Expand Down
6 changes: 3 additions & 3 deletions language/lang.de
View file
Expand Up @@ -699,14 +699,14 @@ $vocab['rep_type_4'] = "jährlich zum gleichen Datum";
$vocab['rep_type_5'] = "monatlich am gleichen Wochentag";
$vocab['rep_type_6'] = "Jours Cycle"; // A traduire
$vocab['required'] = "Die mit einem * versehenen Felder sind obligatorisch.";
$vocab['reservation au nom de'] = "Réservation au nom de "; // A traduire
$vocab['reservation_au_nom_de'] = "Réservation au nom de "; // A traduire
$vocab['Reservation confirmee'] = "Reservierung ist bestätigt";
$vocab['reservations_moderees'] = "moderierte Reservierungen";
$vocab['reservation_a_confirmer_au_plus_tard_le'] = "Reservierung bestätigen, am spätesten am:";
$vocab['reservation_en_attente_de_moderation'] = "Die folgende Reservierung ist im Warten von Moderation für ";
$vocab['reservation_en_bloc'] = "Reservierung";
$vocab['reservation_en_bloc_result'] = "Der Reservierungsvorgang ist erledigt.";
$vocab['reservation_en_bloc_result2'] = "<b>Zahl der Reservierungen, die im Konflikt mit dem aktuellen Reservierungsvorgang standen : </b>";
$vocab['reservation_en_bloc_result2'] = "Zahl der Reservierungen, die im Konflikt mit dem aktuellen Reservierungsvorgang standen :";
$vocab['reservation_en_cours'] = "Reservierungsvorgang erfolgt gerade.";
$vocab['reservation_impossible'] = "Reservierung unmöglich";
$vocab['reservee au nom de'] = "Réservation au nom de "; // A traduire
Expand Down Expand Up @@ -800,7 +800,7 @@ $vocab['sum_by_descrip'] = "kurze Beschreibung";
$vocab['suppression_automatique_des_reservations'] = "Méthode d'exécution automatique de tâches"; // A traduire
$vocab['suppression_automatique'] = "Die Zeitspanne für die Reservierungsbestätigung ist vergangen. Automatische Löschung der Reservierung von ";
$vocab['suppression_en_bloc'] = "Löschung der Reservierungen";
$vocab['suppression_en_bloc_result'] = "Der Löschungsvorgang der Reservierungen ist erledigt.<br /><b>Zahl der gelöschten Reservierungen : </b>";
$vocab['suppression_en_bloc_result'] = "Der Löschungsvorgang der Reservierungen ist erledigt. Zahl der gelöschten Reservierungen :";
$vocab['supprimer_site'] = "Supprimer un site"; // A traduire
$vocab['supprimer_image_ressource'] = "Die aktuelle Bilddatei der Ressource löschen";
$vocab['supprimer_logo'] = "Supprimer le logo actuel"; // A traduire
Expand Down

0 comments on commit 7d109cd

Please sign in to comment.