TheCoreDev/aux-bieaux-legumes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

On avance sur LivraisonParSecteurs

Browse Source
This commit is contained in:
TheCoreDev
2021-02-12 18:31:26 +01:00
parent 9e7232d209
commit 6c7b25e5a2
6 changed files with 54 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
local/modules/LivraisonParSecteurs/Controller/BackOfficeController.php
View File

@@ -123,24 +123,34 @@ class BackOfficeController extends BaseAdminController
if (null !== $response = $this->checkAuth(AdminResources::MODULE, LivraisonParSecteurs::getModuleCode(), AccessManager::UPDATE))
return $response;
$areaSchedule_id = $this->getRequest()->get('area-schedule_id');
$query = LpsAreaScheduleQuery::create()->findById($areaSchedule_id);
if ($query === null)
$error_msg = "Delivery area schedule not found by Id";
else
{
$con = Propel::getConnection();
$con->beginTransaction();
// $query->delete($con);
$con->commit();
$con = Propel::getConnection();
$con->beginTransaction();
$error_msg = "";
$changeForm = $this->createForm("lps-area-schedule-update", "form");
try {
$form = $this->validateForm($changeForm, "POST");
$data = $form->getData();
$areaSchedule_id = $this->getRequest()->get('area-schedule_id');
$query = LpsAreaScheduleQuery::create()->findOneById($areaSchedule_id);
if ($query === null)
$error_msg = "Delivery area schedule not found by Id";
else
{
$query->fromArray($data, TableMap::TYPE_FIELDNAME);
$query->save($con);
$con->commit();
}
} catch (FormValidationException $ex) {
$error_msg = $this->createStandardFormValidationErrorMessage($ex);
}
if ($this->getRequest()->request->get("success_url") == null) {
if ($data['success_url'] == null) {
return new RedirectResponse(URL::getInstance()->absoluteUrl("/admin/module/LivraisonParSecteurs"));
} else {
return new RedirectResponse(URL::getInstance()->absoluteUrl($this->getRequest()->request->get("success_url")));
return new RedirectResponse(URL::getInstance()->absoluteUrl($data['success_url']));
}
}
}

14
local/modules/LivraisonParSecteurs/Form/ScheduleUpdateForm.php
View File

@@ -19,16 +19,14 @@ class ScheduleUpdateForm extends BaseForm
{
$this->formBuilder
->add(
"area_id",
"integer",
[
"area_id","integer", [
"label_attr" => ["for" => "attr-area-id"],
"required" => true,
"constraints" => [new Constraints\NotBlank()]
])
->add(
"area-schedule_id",
"integer",
[
"area-schedule_id","integer", [
"label_attr" => ["for" => "attr-area-schedule-id"],
"required" => true,
"constraints" => [new Constraints\NotBlank()]
])
@@ -40,7 +38,7 @@ class ScheduleUpdateForm extends BaseForm
"multiple" => false,
"attr" => array()
])
->add("begin", "time", [
->add("begin_time", "time", [
"label" => $this->translator->trans("Delivery beginning time", [], LivraisonParSecteurs::MESSAGE_DOMAIN),
"label_attr" => ["for" => "attr-area-schedule-begin"],
"input" => "string",
@@ -48,7 +46,7 @@ class ScheduleUpdateForm extends BaseForm
"required" => true,
"attr" => array()
])
->add("end", "time", [
->add("end_time", "time", [
"label" => $this->translator->trans("Delivery ending time", [], LivraisonParSecteurs::MESSAGE_DOMAIN),
"label_attr" => ["for" => "attr-area-schedule-end"],
"input" => "string",

7
local/modules/LivraisonParSecteurs/templates/backOffice/default/deliveryarea-edit.html
View File

@@ -69,6 +69,13 @@
$(".toggle-active").on('switch-change', function (event, data) {
$("#active").val(data['value'] ? 1 : 0);
});
var hash = location.hash.slice(1);
if (!hash) {
hash = "general";
}
$('#tabbed-menu a[href="#' + hash + '"]').tab('show');
});
</script>
{/javascripts}

30
local/modules/LivraisonParSecteurs/templates/backOffice/default/form/area-schedule-create.html
View File

@@ -4,23 +4,19 @@
{render_form_field form=$form field="success_url" value={url path="/admin/module/LivraisonParSecteurs/edit?area_id={$area_id}#schedule"}}
{render_form_field form=$form field="error_url" value={url path="/admin/module/LivraisonParSecteurs/edit?area_id={$area_id}#schedule"}}
{*
{form_field form=$form field="area-schedule_id"}
<div class="form-group">
<input type="text" class="form-control" name="{$name}" id="{$label_attr.for}"
value="{$area-schedule_id}"/>
<div class="form-group hidden">
<input type="hidden" class="form-control" name="{$name}" id="{$label_attr.for}"
value="{$area-schedule_id|default:$ID}"/>
</div>
{/form_field}
*}
{form_field form=$form field="area_id"}
<div class="form-group">
<input type="text" class="form-control" name="{$name}" id="{$label_attr.for}"
<div class="form-group hidden">
<input type="hidden" class="form-control" name="{$name}" id="{$label_attr.for}"
value="{$area_id}"/>
</div>
{/form_field}
{form_field form=$form field="day"}
<div class="form-group {if $error}has-error{/if}">
<label class="control-label" for="{$label_attr.for}">
@@ -44,14 +40,14 @@
<div class="row">
<div class="col-sm-12">
<h3>{intl l="AM" d='livraisonparsecteurs'}</h3>
{form_field form=$form field="begin"}
{form_field form=$form field="begin_time"}
<div class="form-group {if $error}has-error{/if}">
<label class="control-label" for="{$label_attr.for}">
{intl l=$label d='livraisonparsecteurs'}
{if $required}<span class="required">*</span>{/if}
</label>
{form_error form=$form field="begin"}{$message}{/form_error}
{form_error form=$form field="begin_time"}{$message}{/form_error}
<div class='input-group time' id="{$label_attr.for}">
<input type='text' class="form-control" name="{$name}" value="{$BEGIN|default:"9:00"}"/>
<span class="input-group-addon">
@@ -60,14 +56,14 @@
</div>
</div>
{/form_field}
{form_field form=$form field="end"}
{form_field form=$form field="end_time"}
<div class="form-group {if $error}has-error{/if}">
<label class="control-label" for="{$label_attr.for}">
{intl l=$label d='livraisonparsecteurs'}
{if $required}<span class="required">*</span>{/if}
</label>
{form_error form=$form field="end"}{$message}{/form_error}
{form_error form=$form field="end_time"}{$message}{/form_error}
<div class='input-group time' id="{$label_attr.for}">
<input type='text' class="form-control" name="{$name}" value="{$END|default:"12:00"}"/>
<span class="input-group-addon">
@@ -79,14 +75,14 @@
</div>
</div>
{else}
{form_field form=$form field="begin"}
{form_field form=$form field="begin_time"}
<div class="form-group {if $error}has-error{/if}">
<label class="control-label" for="{$label_attr.for}">
{intl l=$label d='livraisonparsecteurs'}
{if $required}<span class="required">*</span>{/if}
</label>
{form_error form=$form field="begin"}{$message}{/form_error}
{form_error form=$form field="begin_time"}{$message}{/form_error}
<div class='input-group time' id="{$label_attr.for}">
<input type='text' class="form-control" name="{$name}" value="{$BEGIN}"/>
<span class="input-group-addon">
@@ -95,14 +91,14 @@
</div>
</div>
{/form_field}
{form_field form=$form field="end"}
{form_field form=$form field="end_time"}
<div class="form-group {if $error}has-error{/if}">
<label class="control-label" for="{$label_attr.for}">
{intl l=$label d='livraisonparsecteurs'}
{if $required}<span class="required">*</span>{/if}
</label>
{form_error form=$form field="end"}{$message}{/form_error}
{form_error form=$form field="end_time"}{$message}{/form_error}
<div class='input-group time' id="{$label_attr.for}">
<input type='text' class="form-control" name="{$name}" value="{$END}"/>
<span class="input-group-addon">

25
local/modules/LivraisonParSecteurs/templates/backOffice/default/js/area-schedule-js.html
View File

@@ -2,12 +2,13 @@
$(function () {
$('a.area-schedule-delete').click(function (ev) {
$('#attr-area-schedule-id').val($(this).data('id'));
$('#attr-area-schedule-id-delete').val($(this).data('id'));
$("#attr-area-schedule-begin input, #attr-area-schedule-end input").prop('required', false);
$("#attr-area-schedule-day").prop('required', false);
});
$('a.area-schedule-update-default').click(function (ev) {
$("#attr-area-schedule-id-update").val($(this).data('id'));
$("#attr-area-schedule-id").val($(this).data('id'));
$("#attr-area-schedule-begin input", "#area-schedule-update").val($(this).data('begin'));
$("#attr-area-schedule-end input", "#area-schedule-update").val($(this).data('end'));
@@ -24,28 +25,6 @@
// $("#attr-dealer-schedules-day").prop('required', true);
// $('#attr-dealer-schedules-day option').prop('selected', false);
// });
// $('a.dealer-schedules-closed').click(function (ev) {
// $(".period").removeClass("hidden");
// $("#attr-dealer-schedules-closed", "#dealer-schedules-create").val("1");
// $("#attr-dealer-schedules-period-begin input, #attr-dealer-schedules-period-end input").prop('required', true);
// $("#attr-dealer-schedules-day").prop('required', false);
// $('#attr-dealer-schedules-day option').prop('selected', false);
// });
// $('a.dealer-schedules-update-closed').click(function (ev) {
// $(".period").removeClass("hidden");
// $("#attr-dealer-schedules-id", "#dealer-schedules-update").val($(this).data('id'));
// $("#attr-dealer-schedules-begin input", "#dealer-schedules-update").val($(this).data('begin'));
// $("#attr-dealer-schedules-end input", "#dealer-schedules-update").val($(this).data('end'));
// $("#attr-dealer-schedules-period-begin input", "#dealer-schedules-update").val($(this).data('periodbegin'));
// $("#attr-dealer-schedules-period-end input", "#dealer-schedules-update").val($(this).data('periodend'));
// $('#attr-dealer-schedules-day option[value="' + $(this).data('day') + '"]', '#dealer-schedules-update').prop('selected', true);
// $("#attr-dealer-schedules-closed", "#dealer-schedules-update").val("1");
// $("#attr-dealer-schedules-period-begin input, #attr-dealer-schedules-period-end input").prop('required', true);
// $("#attr-dealer-schedules-day").prop('required', false);
//
// });
{$langcode = {lang attr="code"}|substr:0:2}
$(document).ready(function () {

6
local/modules/LivraisonParSecteurs/templates/backOffice/default/modal/area-schedule-modal.html
View File

@@ -1,7 +1,7 @@
{* DELETE modal *}
{capture "schedule_delete"}
{intl l="Do you really want to delete this delivery day ?" d="livraisonparsecteurs"}
<input type="text" name="area-schedule_id" id="attr-area-schedule-id" value="999"/>
<input type="hidden" name="area-schedule_id" id="attr-area-schedule-id-delete" value=""/>
<input type="hidden" name="area_id" value="{$smarty.get.area_id}"/>
<input type="hidden" name="success_url" value="{url path="/admin/module/LivraisonParSecteurs/edit?area_id={$area_id}#schedule"}"/>
{/capture}
@@ -20,13 +20,13 @@ form_action = {token_url path='/admin/module/LivraisonParSecteurs/schedu
{form name="lps-area-schedule-update"}
{capture "schedule_update"}
{form_field form=$form field="area-schedule_id"}
<input type="hidden" id="area-schedule_id" name="attr-area-schedule-id" value=""/>
<input type="hidden" id="attr-area-schedule-id-update" name="area-schedule_id" value=""/>
{/form_field}
{form_field form=$form field="area_id"}
<input type="hidden" id="area_id" name="area_id" value="{$smarty.get.area_id}"/>
{/form_field}
{include file="form/area-schedule-create.html" form_name="lps-area-schedule-update" area-schedule_id=$smarty.get.id update=true}
{include file="form/area-schedule-create.html" form_name="lps-area-schedule-update" update=true}
{/capture}
{include file="includes/generic-create-dialog.html"