markus/finanzen
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Terminierte Transfers implemeniert

Browse Source
This commit is contained in:
Markus 2024-03-17 00:01:23 +01:00
parent 77d4fd938c
commit dda8db42b1
4 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Config/Routes.php
View File

@ -40,7 +40,9 @@ $routes->get('Ajax/(:segment)', 'Ajax::$1');
$routes->post('Ajax/(:segment)', 'Ajax::$1'); $routes->post('Ajax/(:segment)', 'Ajax::$1');
$routes->get('newBill', 'Home::newBill'); $routes->get('newBill', 'Home::newBill');
$routes->get('newTransfer', 'Home::newTransfer'); $routes->get('newTransfer', 'Home::newTransfer');
$routes->get('newScheduled', 'Home::newScheduled'); $routes->get('newScheduled', 'Home::newScheduled/0');
$routes->get('newScheduledTransfer', 'Home::newScheduled/1');
$routes->post('newBill', 'Home::attemptNewBilling'); $routes->post('newBill', 'Home::attemptNewBilling');
$routes->post('editAccount', 'Home::attemptEditAccount'); $routes->post('editAccount', 'Home::attemptEditAccount');

18
app/Controllers/Home.php
View File

@ -72,8 +72,15 @@ class Home extends BaseController
return $data; return $data;
} }
public function newScheduled(){ /**
return $this->newBill(NULL,NULL,true); * Legt eine neue Terminbuchung an
* @param bool $transfer ob Terminbuchung vom Typ Transfer ist
* @return char gibt die View zurück
**/
public function newScheduled($transfer = 0){
$data = $this->loadFormDefaults();
$data['transfer'] = (bool)$transfer;
return $this->newBill($data,NULL,true);
} }
public function newTransfer(){ public function newTransfer(){
@ -94,10 +101,11 @@ class Home extends BaseController
$data['scheduled'] = array('NumList' => array('1'=>'1','2'=>'2','3'=>'3','4'=>'4','5'=>'5','6'=>'6'), $data['scheduled'] = array('NumList' => array('1'=>'1','2'=>'2','3'=>'3','4'=>'4','5'=>'5','6'=>'6'),
'TypeList' => array('week'=>'Woche(n)','month'=>'Monat(e)','year'=>'Jahr(e)'), 'TypeList' => array('week'=>'Woche(n)','month'=>'Monat(e)','year'=>'Jahr(e)'),
'style' => 'class="form-select"'); 'style' => 'class="form-select"');
if (!$data['transfer']) if ($data['transfer'])
$categories = $this->accounts->getDropDownLists( 'InOut', TRUE );
else
$categories = $this->accounts->getDropDownLists( 'Acc', TRUE ); $categories = $this->accounts->getDropDownLists( 'Acc', TRUE );
else
$categories = $this->accounts->getDropDownLists( 'InOut', TRUE );
// $data['catparentlist'] = $categories['parent']; // $data['catparentlist'] = $categories['parent'];
// if (!array_key_exists('catparent', $data)) // if (!array_key_exists('catparent', $data))
// $data['catparent'] = $this->accounts->getParent($data['cat']); // $data['catparent'] = $this->accounts->getParent($data['cat']);

8
app/Models/mScheduled.php
View File

@ -57,11 +57,19 @@ class mScheduled extends Model {
} }
public function saveBill($data){ public function saveBill($data){
$accounts = model('App\Models\mAccounts');
$data['validate'] = true; $data['validate'] = true;
$data['scheduled'] = true; $data['scheduled'] = true;
$data['renummer'] = isset($data['renummer']); $data['renummer'] = isset($data['renummer']);
if ($data['transfer']==1){
$data['receiver'] = $accounts->getDropDownEntry($data['category'][0]);
$data['transfer'] = true;
}
else{
$data['multi'] = isset($data['multiple']); $data['multi'] = isset($data['multiple']);
$data['transfer'] = false; $data['transfer'] = false;
}
unset($data['openamount']); unset($data['openamount']);
unset($data['category_parent']); unset($data['category_parent']);
$data['datum'] = date( "Y-m-d", strtotime($data['datum'] ) ); $data['datum'] = date( "Y-m-d", strtotime($data['datum'] ) );

2
public/js/scheduled.js
View File

@ -13,7 +13,7 @@ $(document).ready(function(){
dom: '<"toolbar">frt', dom: '<"toolbar">frt',
columns: columnspez columns: columnspez
}); });
$("div.toolbar").html('<a class="btn-sm btn-secondary" href="/newScheduled" role="button">Neuer Eintrag</a>'); $("div.toolbar").html('<a class="btn-sm btn-secondary" href="/newScheduled" role="button">Neue Rechnung</a><a class="btn-sm btn-secondary" href="/newScheduledTransfer" role="button">Neuer Transfer</a>');
$('#scheduled tbody').on('click', 'td.dt-receiver', function () {collapseDetails($(this), datatable);} ); $('#scheduled tbody').on('click', 'td.dt-receiver', function () {collapseDetails($(this), datatable);} );
$('#scheduled tbody').on('click', 'td.dt-datum', function () {location.href = '/editScheduled/'+getId($(this),datatable);}); $('#scheduled tbody').on('click', 'td.dt-datum', function () {location.href = '/editScheduled/'+getId($(this),datatable);});