From b5c0090f8784a8cf6bcfe34b46773df134e519f2 Mon Sep 17 00:00:00 2001 From: Wilfried Trinkl Date: Tue, 14 May 2019 15:44:37 +0200 Subject: [PATCH] Budget 2019 --- plugins/AsdCurl/src/AsdCurl.php | 4 +- plugins/AsdCurl/src/AsdUp.php | 15 +- src/Controller/BudgetController.php | 17 +- src/Controller/SchoolsController.php | 18 +++ src/Template/Schools/showbudgets.ctp | 40 ++++- src/Template/Schools/showlist.ctp | 4 + webroot/files/debug-edit.txt | 230 +++++++++++++-------------- webroot/files/debug-single.txt | 9 +- 8 files changed, 200 insertions(+), 137 deletions(-) create mode 100644 src/Template/Schools/showlist.ctp diff --git a/plugins/AsdCurl/src/AsdCurl.php b/plugins/AsdCurl/src/AsdCurl.php index e37d5c3..cbc56db 100644 --- a/plugins/AsdCurl/src/AsdCurl.php +++ b/plugins/AsdCurl/src/AsdCurl.php @@ -95,7 +95,7 @@ class AsdCurl $login_data = [ 'asd_username' => 'A005_TrinklW', - 'asd_password' => 'HiegTzs!12', + 'asd_password' => 'HiegTzs!183', //'asd_username' => 'A005_Superuser', //'asd_password' => 'asdtest01', ]; @@ -172,7 +172,7 @@ class AsdCurl //debug($html); $login_data = [ 'portal_username' => 'asd.trinkl', - 'portal_password' => 'HiegTzs!182', + 'portal_password' => 'HiegTzs!192', ]; $post = [ diff --git a/plugins/AsdCurl/src/AsdUp.php b/plugins/AsdCurl/src/AsdUp.php index f9ad697..77e265b 100644 --- a/plugins/AsdCurl/src/AsdUp.php +++ b/plugins/AsdCurl/src/AsdUp.php @@ -37,7 +37,7 @@ class AsdUp extends AsdCurl 'mainForm:istAnzeigeMaske' => 'false', 'mainForm:schulnr' => $snr, 'mainForm:action_anzeigen' => 'Direkt zur gewählten Schule', - 'mainForm:schuljahr' => '23', + 'mainForm:schuljahr' => '24', 'javax.faces.ViewState' => $viewstate ]; @@ -63,6 +63,7 @@ class AsdUp extends AsdCurl if(!($this->status)) { die($this->error); } + // Im linken Menue Budget GY anzeigen $viewstate = $this->get_string_between($this->html, 'id="javax.faces.ViewState" value="', '" autocomplete'); $conversationId = $this->get_string_between($this->html, 'name="conversationId" value="', '" />'); @@ -135,7 +136,7 @@ class AsdUp extends AsdCurl if(!($this->status)) { die($this->error); } - + //echo $this->html;die; } public function read_budget($ch,$snr) { @@ -145,7 +146,7 @@ class AsdUp extends AsdCurl $htmlParser->loadHTML($this->html); //Loaded the html string we took from simple xml $htmlParser->preserveWhiteSpace = false; - //echo $this->html; + //echo $this->html;die; $headers = ['checkbox','herkunft','budget','von','bis','count','comment']; $table = $htmlParser->getElementById('mainForm:dataTable:zuschlaege'); @@ -371,10 +372,10 @@ class AsdUp extends AsdCurl 'skipvalidation' => 'false', 'mainForm:istAnzeigeMaske' => 'false', 'mainForm:schulnr' => '', - 'mainForm:schuljahr' => '23', + 'mainForm:schuljahr' => '24', 'mainForm:schulnummer' => $budget['snr'], 'mainForm:tab2:artZuschlag' => 'com.hp.asd.wl.domain.standard.Budgetform:' . $budget['wl_werteliste_nr'], - 'mainForm:tab2:datumBis' => '31.07.2019', + 'mainForm:tab2:datumBis' => '31.07.2020', 'mainForm:tab2:_edit_budget' => $budget['count'], 'mainForm:tab2:_edit_bemerkung' => $budget['comment'], 'mainForm:tab2:hinzufuegen' => 'Hinzufügen', @@ -402,10 +403,10 @@ class AsdUp extends AsdCurl 'skipvalidation' => 'false', 'mainForm:istAnzeigeMaske' => 'false', 'mainForm:schulnr' => '', - 'mainForm:schuljahr' => '23', + 'mainForm:schuljahr' => '24', 'mainForm:schulnummer' => $budget['snr'], 'mainForm:tab2:artZuschlag' => 'com.hp.asd.wl.domain.standard.Budgetform:' . $budget['wl_werteliste_nr'], - 'mainForm:tab2:datumBis' => '31.07.2019', + 'mainForm:tab2:datumBis' => '31.07.2020', 'mainForm:tab2:_edit_budget' => '', 'mainForm:tab2:_edit_bemerkung' => '', 'mainForm:speichern' => 'Speichern', diff --git a/src/Controller/BudgetController.php b/src/Controller/BudgetController.php index cf5f291..366ae97 100644 --- a/src/Controller/BudgetController.php +++ b/src/Controller/BudgetController.php @@ -77,6 +77,7 @@ class BudgetController extends AppController //debug($budget_id); $uploadData = ''; if ($this->request->is('post')) { + // csv file mit 1.Spalte: SNR; 2. Spalte: Anzahl; 3. Spalte: Kommentar if(!empty($this->request->data['file']['name'])){ $result = $this->Budget->deleteAll(['wl_budget_id' => $budget_id]); //debug($result);die; @@ -98,7 +99,7 @@ class BudgetController extends AppController $new_budget['wl_budget_id'] = $budget_id; $new_budget['count'] = $line_arr[1]; $new_budget['comment'] = trim($line_arr[2]); - $new_budget['year'] = '2018'; + $new_budget['year'] = '2019'; $new_budget['asd'] = false; $snr_arr[$line_arr[0]] = $new_budget; } @@ -517,27 +518,33 @@ class BudgetController extends AppController if(isset($line['budget'])) { if ($line['budget'] == $budget_typ['wl_kurz_bezeichnung']) { - debug($key); + //debug($key); $curl->del_budget($ch,$budget['snr'],$key); $budget['count'] = $budget['count'] + $line['count']; - $budget['comment'] = $line['comment'] . '; ' . $budget['comment'] ; + if(strlen($budget['comment']) > 1) { + $budget['comment'] = $line['comment'] . '; ' . $budget['comment'] ; + } } } } - debug($budget); + //debug($budget); $curl->write_budget($ch,$budget); $budget->asd = true; $this->Budget->save($budget); array_push($output,$budget); } else { - if(!$pos) { + //if(!$pos) { + if(true) { + //debug($budget); + //die; $curl->write_budget($ch,$budget); $budget->asd = true; $this->Budget->save($budget); array_push($output,$budget); } } + //die; } $this->set('output',$output); } diff --git a/src/Controller/SchoolsController.php b/src/Controller/SchoolsController.php index 4cb7dbc..55e61dd 100644 --- a/src/Controller/SchoolsController.php +++ b/src/Controller/SchoolsController.php @@ -2,6 +2,8 @@ namespace App\Controller; use App\Controller\AppController; +use AsdCurl\AsdUp; + /** * Schools Controller @@ -12,6 +14,22 @@ use App\Controller\AppController; */ class SchoolsController extends AppController { + public function showlist($snr = null) { + $session = $this->request->session(); + $schooltype = $session->read('SchoolType'); + + $curl = new AsdUp(); + $ch = $curl->init_curl_params(); + $curl->login_school($ch); //Login Schulportal + $curl->login_asd($ch); + //$budget['snr'] = $snr; + $curl->goto_budget($ch,$schooltype); + //debug($snr); + $curl->change_school($ch,$snr); + $data = $curl->read_budget($ch,$snr); + $this->set('data',$data); + } + public function showajax($snr = null) { $session = $this->request->session(); $schooltype = $session->read('SchoolType'); diff --git a/src/Template/Schools/showbudgets.ctp b/src/Template/Schools/showbudgets.ctp index 3098b60..0a0fbb6 100644 --- a/src/Template/Schools/showbudgets.ctp +++ b/src/Template/Schools/showbudgets.ctp @@ -5,14 +5,17 @@
+
+