merge request id	876
Titel	Feature/ll 1555 data processing of terminated client
Beschreibung	s. http://jira.learningsystem.de/browse/LL-1555
Status	merged
Created at	2023-08-24T06:39:51.733Z
Updated at	2023-09-18T07:46:30.146Z
Source branch	feature/LL-1555-data-processing-of-terminated-client
Target branch	develop
Author	Gregor Gabriel
Assignee	Sascha Immig

Discussion notes

added 148 commits a2ee72cf...9f97851f - 147 commits from branch develop cdee0d03 - Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into… Compare with previous version	Gregor Gabriel	2023-08-25T09:42:56.405Z
added 3 commits cdee0d03...3a36e5bb - 2 commits from branch develop e3ac848f - Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into… Compare with previous version	Gregor Gabriel	2023-08-25T09:44:01.055Z
added 1 commit 2e3ae555 - replaced count by exists Compare with previous version	Gregor Gabriel	2023-08-25T09:52:43.215Z
added 1 commit 79719e6c - removed dublicate function Compare with previous version	Gregor Gabriel	2023-08-25T09:55:03.977Z
added 1 commit d41037aa - fixed merge error Compare with previous version	Gregor Gabriel	2023-08-25T11:04:22.946Z
added 2 commits 58d18fc1 - indented flash message a713bb65 - Changed wording Compare with previous version	Sascha Immig	2023-09-08T12:46:25.423Z
added 1 commit bc84dbdd - fixed requirements from Sascha explained il LL-1555 Compare with previous version	Gregor Gabriel	2023-09-11T14:57:26.168Z
added 1 commit fa6ff18e - LL-1624 - adapted text to Sascha's request Compare with previous version	Gregor Gabriel	2023-09-15T11:15:55.994Z
merged	Sascha Immig	2023-09-18T07:46:30.195Z

Merge Commits

Title	Id	Author	Created at	Message
added test for ClientController::reactivate(...)	2917f6e6bd5d1d7ecfb5756259c7ecdb25dcc65b	TUV\gabrielg	2023-07-27T16:29:27.000Z	added test for ClientController::reactivate(...)
replaced count by exists	2e3ae5551b63c542cb0e3bfae98c4c32cf858ec0	TUV\gabrielg	2023-08-25T09:52:36.000Z	replaced count by exists
+ Client::clean() now physically deletes client trainings, this is possible by calling prune method	500688be3b335a65bd3638b01a0d7d7ca8f64729	TUV\gabrielg	2023-07-25T07:03:58.000Z	+ Client::clean() now physically deletes client trainings, this is possible by calling prune method + fixed missing validation error display when trying do create training
Client::clean() method now "force deletes" clients organization units as prune is not appliable	539c58cd99ffb5ea27b608ae62e1e59e619b04d4	TUV\gabrielg	2023-07-25T06:30:13.000Z	Client::clean() method now "force deletes" clients organization units as prune is not appliable
indented flash message	58d18fc16d0c3a9ef650cdc0eec62f42437456ca	TUV\immigs	2023-09-08T07:22:55.000Z	indented flash message
added test for ClientController::resign()	5e31972bd78671dc9e3047293054822ca0b83cfb	TUV\gabrielg	2023-07-27T16:22:08.000Z	added test for ClientController::resign()
+ reworked together with Sascha	62f193d3a9312bd60ee2aa8d6dc000f32ed4ca47	TUV\gabrielg	2023-07-27T15:16:17.000Z	+ reworked together with Sascha + extended tests
removed dublicate function	79719e6c4731ef0507e1f7393f8e43dc4b816109	TUV\gabrielg	2023-08-25T09:54:57.000Z	removed dublicate function
fixed platform account close error for free clients	9adc80d91b15db1791d20e592d39ec651d722d9b	TUV\gabrielg	2023-07-27T15:20:11.000Z	fixed platform account close error for free clients
fixed little errors	a2ee72cfd06573368a9a0f7a4522b0f9f4bc175d	TUV\gabrielg	2023-07-28T07:38:51.000Z	fixed little errors - wrong test - missing additional check when to display merge function
LL-1561 merge clients	a3292286d9d3b67211a67bef2b7bdec7fabaf8bf	TUV\gabrielg	2023-07-25T12:20:20.000Z	LL-1561 merge clients
Changed wording	a713bb65007e912a540e3dce302e9e8dd2cd7094	TUV\immigs	2023-09-08T12:28:25.000Z	Changed wording
added tree tariff standard catalogs to reactivated client	ae257894e3963f60a1d7b101a4d7def7e8e15e30	TUV\gabrielg	2023-07-25T06:16:56.000Z	added tree tariff standard catalogs to reactivated client
fixed requirements from Sascha explained il LL-1555	bc84dbdd880541cc65f4d53379a3a99a1494f053	TUV\gabrielg	2023-09-11T14:57:16.000Z	fixed requirements from Sascha explained il LL-1555
Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into…	cdee0d035e09cbbcb60a1c7ab35875c3260d352e	TUV\gabrielg	2023-08-25T09:42:45.000Z	Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-1555-data-processing-of-terminated-client # Conflicts: # app/Models/Catalog.php # app/Models/Category.php # app/Models/Content.php # app/Models/Group.php # app/Models/MailTemplate.php # app/Models/ParticipationCertificate.php # resources/lang/de/clients.php # resources/lang/en/clients.php # resources/lang/es/clients.php # resources/lang/fr/clients.php # resources/views/admin/clients/edit.blade.php
fixed merge error	d41037aaa2c1e797ca5e2c5c350e45e727d0b294	TUV\gabrielg	2023-08-25T11:04:13.000Z	fixed merge error
LL-1559 reactivation of canceled client	d70994a372fe891b730d36100264b9a0e1e93349	TUV\gabrielg	2023-07-24T16:39:09.000Z	LL-1559 reactivation of canceled client
+ added test for ClientController::merge(...) function	d990c6d73655ee4bf76507bd4beaab8847894b88	TUV\gabrielg	2023-07-27T16:12:28.000Z	+ added test for ClientController::merge(...) function + fixed check problem in merge function
Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into…	e3ac848f2bc26c55e5765d5124c5b249d010942c	TUV\gabrielg	2023-08-25T09:43:50.000Z	Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-1555-data-processing-of-terminated-client
LL-1624 - adapted text to Sascha's request	fa6ff18e864f34ce9e0bfb26b1e05ed8f1c9f003	TUV\gabrielg	2023-09-15T11:15:43.000Z	LL-1624 - adapted text to Sascha's request