From cdc5763d35e25f8d507aa1ae804d39bc6b26abb5 Mon Sep 17 00:00:00 2001 From: Daniel Date: Wed, 4 Oct 2023 13:14:25 +0200 Subject: [PATCH] team get member fix --- src/client/app/js/app/state/StatsExport.js | 3 ++- .../manager/js/app/views/appointments/AppointmentCalendar.js | 3 ++- .../manager/js/app/views/appointments/AppointmentList.js | 3 ++- src/client/manager/js/app/views/contract/ContractCharging.js | 3 ++- src/client/manager/js/app/views/contract/ContractCreate.js | 3 ++- src/client/manager/js/app/views/corona/CoronaSpecial.js | 3 ++- src/client/manager/js/app/views/kkspecial/EmployeeList.js | 3 ++- src/client/manager/js/app/views/members/MemberList.js | 4 +++- src/client/manager/js/app/views/settings/SettingsAccess.js | 3 ++- src/server/server/config/boot_local.php | 2 +- 10 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/client/app/js/app/state/StatsExport.js b/src/client/app/js/app/state/StatsExport.js index 28a2e57..fd2e881 100644 --- a/src/client/app/js/app/state/StatsExport.js +++ b/src/client/app/js/app/state/StatsExport.js @@ -104,7 +104,8 @@ app.state.StatsExport = function() 'Team', 'getDetails', { - teamId : groupId + teamId : groupId, + includeMembers: true }, function( res2 ) { diff --git a/src/client/manager/js/app/views/appointments/AppointmentCalendar.js b/src/client/manager/js/app/views/appointments/AppointmentCalendar.js index 69bf9cf..a28eba3 100644 --- a/src/client/manager/js/app/views/appointments/AppointmentCalendar.js +++ b/src/client/manager/js/app/views/appointments/AppointmentCalendar.js @@ -23,7 +23,8 @@ const AppointmentCalendar = { 'Team', 'getDetails', { - teamId : p.groupId + teamId : p.groupId, + includeMembers: true }, function( res ) { diff --git a/src/client/manager/js/app/views/appointments/AppointmentList.js b/src/client/manager/js/app/views/appointments/AppointmentList.js index ff5a78d..3d1b49d 100644 --- a/src/client/manager/js/app/views/appointments/AppointmentList.js +++ b/src/client/manager/js/app/views/appointments/AppointmentList.js @@ -25,7 +25,8 @@ const AppointmentList = { 'Team', 'getDetails', { - teamId : groupId + teamId : groupId, + includeMembers: true }, function( res ) { diff --git a/src/client/manager/js/app/views/contract/ContractCharging.js b/src/client/manager/js/app/views/contract/ContractCharging.js index 8ec54e1..0b2e137 100644 --- a/src/client/manager/js/app/views/contract/ContractCharging.js +++ b/src/client/manager/js/app/views/contract/ContractCharging.js @@ -40,7 +40,8 @@ const ContractCharging = { 'Team', 'getDetails', { - teamId : groupId + teamId : groupId, + includeMembers: true }, function( res ) { diff --git a/src/client/manager/js/app/views/contract/ContractCreate.js b/src/client/manager/js/app/views/contract/ContractCreate.js index 2829a0f..ca03116 100644 --- a/src/client/manager/js/app/views/contract/ContractCreate.js +++ b/src/client/manager/js/app/views/contract/ContractCreate.js @@ -25,7 +25,8 @@ const ContractCreate = { 'Team', 'getDetails', { - teamId : groupId + teamId : groupId, + includeMembers: true }, function( res ) { diff --git a/src/client/manager/js/app/views/corona/CoronaSpecial.js b/src/client/manager/js/app/views/corona/CoronaSpecial.js index 97ddfe2..1439810 100644 --- a/src/client/manager/js/app/views/corona/CoronaSpecial.js +++ b/src/client/manager/js/app/views/corona/CoronaSpecial.js @@ -27,7 +27,8 @@ const CoronaSpecial = { 'Team', 'getDetails', { - teamId : groupId + teamId : groupId, + includeMembers: true }, function( res ) { diff --git a/src/client/manager/js/app/views/kkspecial/EmployeeList.js b/src/client/manager/js/app/views/kkspecial/EmployeeList.js index de6728b..32b8d8e 100644 --- a/src/client/manager/js/app/views/kkspecial/EmployeeList.js +++ b/src/client/manager/js/app/views/kkspecial/EmployeeList.js @@ -44,7 +44,8 @@ const EmployeeList = { 'Team', 'getDetails', { - teamId : p.get( 'groupId' ) + teamId : p.get( 'groupId' ), + includeMembers: true }, function( res ) { diff --git a/src/client/manager/js/app/views/members/MemberList.js b/src/client/manager/js/app/views/members/MemberList.js index 65d0fb6..a01de61 100644 --- a/src/client/manager/js/app/views/members/MemberList.js +++ b/src/client/manager/js/app/views/members/MemberList.js @@ -22,7 +22,9 @@ const MemberList = { 'Team', 'getDetails', { - teamId : p.get( 'groupId' ) + teamId : p.get( 'groupId' ), + includeMembers: true + }, function( res ) { diff --git a/src/client/manager/js/app/views/settings/SettingsAccess.js b/src/client/manager/js/app/views/settings/SettingsAccess.js index 42828ad..99b9eaa 100644 --- a/src/client/manager/js/app/views/settings/SettingsAccess.js +++ b/src/client/manager/js/app/views/settings/SettingsAccess.js @@ -26,7 +26,8 @@ const SettingsAccess = { 'Team', 'getDetails', { - teamId : groupId + teamId : groupId, + includeMembers: true }, function( res ) { diff --git a/src/server/server/config/boot_local.php b/src/server/server/config/boot_local.php index 7ca7242..25e0d44 100644 --- a/src/server/server/config/boot_local.php +++ b/src/server/server/config/boot_local.php @@ -39,4 +39,4 @@ Francis_Utils_Config::set( 'slack.logWebhook', "https://hooks.slack.com/services Francis_Utils_Config::set( 'analytics.trackingId', 'UA-139730172-1' ); // Manager console -Francis_Utils_Config::set( 'url.manager', 'https://manager.probuddy.de/' ); +Francis_Utils_Config::set( 'url.manager', 'http://localhost:8097/client/manager' );