Project-Pro/crmPRO
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Zaktualizuj logikę wyświetlania zadań do przeglądu i zadań zbiorczych, popraw ustawienia e-mail oraz dostosuj style w widoku zadań

Browse Source
This commit is contained in:
Jacek Pyziak
2025-02-20 19:26:42 +01:00
parent c10650e888
commit 7769790e84
8 changed files with 109 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
autoload/controls/class.Tasks.php
View File

@@ -104,13 +104,44 @@ class Tasks
exit;
}
if ( \S::get( 'tasks_bulk' ) == 'hide' )
{
\S::set_session( 'tasks_bulk', 'hide' );
header( 'Location: /tasks/main_view/' );
exit;
}
if ( \S::get( 'tasks_bulk' ) == 'show' )
{
\S::del_session( 'tasks_bulk' );
header( 'Location: /tasks/main_view/' );
exit;
}
// tasks_to_review
if ( \S::get( 'tasks_to_review' ) == 'hide' )
{
\S::set_session( 'tasks_to_review', 'hide' );
header( 'Location: /tasks/main_view/' );
exit;
}
if ( \S::get( 'tasks_to_review' ) == 'show' )
{
\S::del_session( 'tasks_to_review' );
header( 'Location: /tasks/main_view/' );
exit;
}
$show_tasks_closed = \S::get_session( 'tasks_closed' );
$show_tasks_bulk = \S::get_session( 'tasks_bulk' );
$show_tasks_to_review = \S::get_session( 'tasks_to_review' );
return \Tpl::view( 'tasks/main_view', [
'tasks_new' => \factory\Tasks::get_tasks( 0, $user['id'], \S::get_session( 'selected_projects' ), \S::get_session( 'selected_users' ) ),
'tasks_to_review' => \factory\Tasks::get_tasks( 1, $user['id'], \S::get_session( 'selected_projects' ), \S::get_session( 'selected_users' ) ),
'tasks_to_review' => $show_tasks_to_review == 'hide' ? null : \factory\Tasks::get_tasks( 1, $user['id'], \S::get_session( 'selected_projects' ), \S::get_session( 'selected_users' ) ),
'tasks_closed' => $show_tasks_closed == 'hide' ? null : \factory\Tasks::get_tasks( 2, $user['id'], \S::get_session( 'selected_projects' ), \S::get_session( 'selected_users' ) ), // zakończone
'tasks_bulk' => \factory\Tasks::get_tasks( 3, $user['id'], \S::get_session( 'selected_projects' ), \S::get_session( 'selected_users' ) ), // opłaty
'tasks_bulk' => $show_tasks_bulk == 'hide' ? null : \factory\Tasks::get_tasks( 3, $user['id'], \S::get_session( 'selected_projects' ), \S::get_session( 'selected_users' ) ), // opłaty
'tasks_suspended' => \factory\Tasks::get_tasks( 4, $user['id'], \S::get_session( 'selected_projects' ), \S::get_session( 'selected_users' ) ), // projektowe
'tasks_to_do' => \factory\Tasks::get_tasks( 5, $user['id'], \S::get_session( 'selected_projects' ), \S::get_session( 'selected_users' ) ), // do zrobienia
'tasks_fvat' => \factory\Tasks::get_tasks( 6, $user['id'], \S::get_session( 'selected_projects' ), \S::get_session( 'selected_users' ) ), // faktury
@@ -122,6 +153,8 @@ class Tasks
'selected_users' => \S::get_session( 'selected_users' ),
'tasks_filtrs' => \factory\Tasks::get_filtrs( $user['id'] ),
'show_tasks_closed' => $show_tasks_closed,
'show_tasks_bulk' => $show_tasks_bulk,
'show_tasks_to_review' => $show_tasks_to_review,
'users' => \factory\Users::users_list(),
] );
}
@@ -241,12 +274,13 @@ class Tasks
$statuses = \factory\Tasks::get_statuses();
if ( $task['status_change_mail'] )
if ( $task['status_change_mail'] ) {
\S::send_email(
'jacek.pyziak@project-pro.pl',
'biuro@project-pro.pl',
'crmPRO - zmieniono status zadania',
'<p>Witaj<br/>zmieniono status zadania <b>' . $task['name'] . ' - ' . \factory\Crm::get_client_name( (int)$task['client_id'] ) . '</b> na <b>' . $statuses[ $task['status'] ] . '</b>.</p>'
);
}
}
static public function task_change_status()
@@ -255,7 +289,7 @@ class Tasks
if ( $mdb -> update( 'tasks', [ 'status' => \S::get( 'status' ) ], [ 'id' => \S::get( 'task_id' ) ] ) )
{
if ( \S::get( 'status' ) == 1 or \S::get( 'status' ) == 2 )
if ( \S::get( 'status' ) == 3 or \S::get( 'status' ) == 1 )
{
self::send_email_task_change_status( \S::get( 'task_id' ) );
}