From c2b78ee3b4eb66d37398dd354ebd58da05a4e83f Mon Sep 17 00:00:00 2001 From: Maxime Bourget Date: Sat, 15 Jun 2013 13:57:58 +0100 Subject: [PATCH] Cancel button (on item_schedule) works. --- haxe/ItemScheduler.hx | 12 ++++++++++-- hincludes/lib/ItemScheduler.class.php | 20 ++++++++++++++++++-- item_schedule.php | 5 +++++ 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/haxe/ItemScheduler.hx b/haxe/ItemScheduler.hx index 4799420..3122a9d 100644 --- a/haxe/ItemScheduler.hx +++ b/haxe/ItemScheduler.hx @@ -430,9 +430,17 @@ function update() { } +function cancel() { + parameters = null; +} + public function action() { - if(parameters != null && parameters.mode == ScheduleMode.Update) { - update(); + if(parameters != null) { + switch(parameters.mode) { + case ScheduleMode.Update: update(); + case ScheduleMode.Cancel: cancel(); + case ScheduleMode.Move: + } } } diff --git a/hincludes/lib/ItemScheduler.class.php b/hincludes/lib/ItemScheduler.class.php index 9e55a20..9e7ae69 100644 --- a/hincludes/lib/ItemScheduler.class.php +++ b/hincludes/lib/ItemScheduler.class.php @@ -17,10 +17,26 @@ class ItemScheduler { return (($user_picked === null) ? $picked : $user_picked); } public function action() { - if($this->parameters !== null && $this->parameters->mode == ScheduleMode::$Update) { - $this->update(); + if($this->parameters !== null) { + $»t = ($this->parameters->mode); + switch($»t->index) { + case 0: + { + $this->update(); + }break; + case 1: + { + $this->cancel(); + }break; + case 2: + { + }break; + } } } + public function cancel() { + $this->parameters = null; + } public function update() { $orders = $this->orders(); $priorities = Lambda::harray(Lambda::map($orders, array(new _hx_lambda(array(&$orders), "ItemScheduler_0"), 'execute'))); diff --git a/item_schedule.php b/item_schedule.php index 9eac399..30e1ac2 100644 --- a/item_schedule.php +++ b/item_schedule.php @@ -74,6 +74,11 @@ if(isset($_POST['Update'])) { $params = new ScheduleParameters($_SESSION['schedule_parameters']); $params->setMode('update'); } +else if(isset($_POST['Cancel'])) { + $Ajax->activate('item_schedule'); + $params = new ScheduleParameters($_SESSION['schedule_parameters']); + $params->setMode('cancel'); +} else { $params = in_ajax() && $stock_id == @$_POST['last_stock_id'] ? new ScheduleParameters($_POST) : null; // save parameters form update -- 2.30.2