Skip to content

Commit efa5fcb

Browse files
committed
fix(targetticket): follow change in GLPI for due date
renamed to time_to_resolve
1 parent e2288bf commit efa5fcb

File tree

1 file changed

+33
-28
lines changed

1 file changed

+33
-28
lines changed

inc/targetticket.class.php

Lines changed: 33 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,35 +1192,8 @@ public function save(PluginFormcreatorForm_Answer $formanswer) {
11921192
break;
11931193
}
11941194

1195-
// Define due date
1196-
if ($this->fields['due_date_question'] !== null) {
1197-
$found = $answer->find('`plugin_formcreator_forms_answers_id` = '.$formanswer->fields['id'].
1198-
' AND `plugin_formcreator_questions_id` = '.$this->fields['due_date_question']);
1199-
$date = array_shift($found);
1200-
} else {
1201-
$date = null;
1202-
}
1203-
$str = "+" . $this->fields['due_date_value'] . " " . $this->fields['due_date_period'];
1195+
$data = $this->setTargetDueDate($data, $formanswer);
12041196

1205-
switch ($this->fields['due_date_rule']) {
1206-
case 'answer':
1207-
$due_date = $date['answer'];
1208-
break;
1209-
case 'ticket':
1210-
$due_date = date('Y-m-d H:i:s', strtotime($str));
1211-
break;
1212-
case 'calcul':
1213-
$due_date = date('Y-m-d H:i:s', strtotime($date['answer'] . " " . $str));
1214-
break;
1215-
default:
1216-
$due_date = null;
1217-
break;
1218-
}
1219-
if (!is_null($due_date)) {
1220-
$data['due_date'] = $due_date;
1221-
}
1222-
1223-
// Define urgency
12241197
$data = $this->setTargetUrgency($data, $formanswer);
12251198

12261199
$data = $this->setTargetCategory($data, $formanswer);
@@ -1343,6 +1316,38 @@ protected function setTargetCategory($data, $formanswer) {
13431316
return $data;
13441317
}
13451318

1319+
protected function setTargetDueDate($data, $formanswer) {
1320+
$answer = new PluginFormcreatorAnswer();
1321+
if ($this->fields['due_date_question'] !== null) {
1322+
$found = $answer->find('`plugin_formcreator_forms_answers_id` = '.$formanswer->fields['id'].
1323+
' AND `plugin_formcreator_questions_id` = '.$this->fields['due_date_question']);
1324+
$date = array_shift($found);
1325+
} else {
1326+
$date = null;
1327+
}
1328+
$str = "+" . $this->fields['due_date_value'] . " " . $this->fields['due_date_period'];
1329+
1330+
switch ($this->fields['due_date_rule']) {
1331+
case 'answer':
1332+
$due_date = $date['answer'];
1333+
break;
1334+
case 'ticket':
1335+
$due_date = date('Y-m-d H:i:s', strtotime($str));
1336+
break;
1337+
case 'calcul':
1338+
$due_date = date('Y-m-d H:i:s', strtotime($date['answer'] . " " . $str));
1339+
break;
1340+
default:
1341+
$due_date = null;
1342+
break;
1343+
}
1344+
if (!is_null($due_date)) {
1345+
$data['time_to_resolve'] = $due_date;
1346+
}
1347+
1348+
return $data;
1349+
}
1350+
13461351
protected function setTargetUrgency($data, $formanswer) {
13471352
switch ($this->fields['urgency_rule']) {
13481353
case 'answer':

0 commit comments

Comments
 (0)