Refactor task status handling and update styles for task views; add support for 'faktury' status

This commit is contained in:
2024-12-15 11:11:47 +01:00
parent 65d366cc7d
commit 8c42e65d57
12 changed files with 89 additions and 28 deletions

View File

@@ -43,6 +43,23 @@
<? endforeach;?>
</ul>
</div>
<? if ( $this -> user['id'] === 1 ):?>
<div class="column tasks_fvat">
<h2>Faktury</h2>
<ul>
<? foreach ( $this -> tasks_fvat as $task ):?>
<?
echo \Tpl::view( 'tasks/task_single', [
'task' => $task,
'user' => $this -> user,
'statuses' => $this -> statuses,
'task_open' => $this -> open_task_id == $task['id'] ? true : false
] );
?>
<? endforeach;?>
</ul>
</div>
<? endif;?>
<!-- tasks_suspended -->
<div class="column tasks_suspended">
<h2>Zadania zawieszone (u klienta)</h2>
@@ -143,6 +160,7 @@
$( '.tasks_container .tasks_bulk ul' ).empty().append( data.tasks_bulk );
$( '.tasks_container .tasks_suspended ul' ).empty().append( data.tasks_suspended );
$( '.tasks_container .tasks_to_do ul' ).empty().append( data.tasks_to_do );
$( '.tasks_container .tasks_fvat ul' ).empty().append( data.tasks_fvat );
}
});
}

View File

@@ -91,7 +91,7 @@ if ( is_array( $this -> clients ) )
'name' => 'status',
'id' => 'status',
'value' => $this -> task[ 'status' ],
'values' => \factory\Tasks::$statuses
'values' => \factory\Tasks::get_statuses()
] );?>
<? if ( $this -> user['id'] == 1 ):?>
<?= \Html::input([

View File

@@ -67,7 +67,7 @@
<h3>Status</h3>
<div class="current_status">
<select name="task_status" class="form-control" task_id="<?= $this -> task['id'];?>">
<? foreach ( \factory\Tasks::$statuses as $key => $status ):?>
<? foreach ( \factory\Tasks::get_statuses() as $key => $status ):?>
<option value="<?= $key;?>" <? if ( $this -> task['status'] == $key ):?>selected="selected"<? endif;?>><?= $status;?></option>
<? endforeach;?>
</select>

View File

@@ -27,7 +27,7 @@
Status:<br><strong><?= $this -> statuses[ $this -> task['status'] ];?></strong>
<div class="status_change">
<select name="task_status" task_id="<?= $this -> task['id'];?>">
<? foreach ( \factory\Tasks::$statuses as $key => $status ):?>
<? foreach ( \factory\Tasks::get_statuses() as $key => $status ):?>
<option value="<?= $key;?>" <? if ( $this -> task['status'] == $key ):?>selected="selected"<? endif;?>><?= $status;?></option>
<? endforeach;?>
</select>