Overview
Comment:Improve UX of user details
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | dev
Files: files | file ages | folders
SHA3-256: 5d8b11cefccd612443874622c06123f267bde400707dd4ef3e2db7818fe1373a
User & Date: bohwaz on 2023-04-08 21:42:20
Other Links: branch diff | manifest | tags
Context
2023-04-08
22:13
Merge with trunk check-in: 6f574eb882 user: bohwaz tags: dev
21:42
Improve UX of user details check-in: 5d8b11cefc user: bohwaz tags: dev
21:42
Remove Define, as it is unsupported in .htaccess check-in: e114fbb10d user: bohwaz tags: dev
Changes

Modified src/include/lib/Garradin/Utils.php from [00c4d030b4] to [f00f207126].

334
335
336
337
338
339
340









341
342
343
344
345
346
347
        if (isset($_GET['_dialog'])) {
            self::reloadParentFrame($destination);
        }
        else {
            self::redirect($destination);
        }
    }










    static public function reloadParentFrame(?string $destination = null): void
    {
        $url = self::getLocalURL($destination ?? '!');

        echo '
            <!DOCTYPE html>







>
>
>
>
>
>
>
>
>







334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
        if (isset($_GET['_dialog'])) {
            self::reloadParentFrame($destination);
        }
        else {
            self::redirect($destination);
        }
    }

    static public function reloadParentFrameIfDialog(?string $destination = null): void
    {
        if (!isset($_GET['_dialog'])) {
            return;
        }

        self::reloadParentFrame($destination);
    }

    static public function reloadParentFrame(?string $destination = null): void
    {
        $url = self::getLocalURL($destination ?? '!');

        echo '
            <!DOCTYPE html>

Modified src/templates/services/user/index.tpl from [b51b11d5c0] to [d043e293fc].

24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
	</dd>
	{/foreach}
	{if !$only && !$after}
	<dt>Nombre d'inscriptions pour ce membre</dt>
	<dd>
		{$list->count()}
		{if $session->canAccess($session::SECTION_USERS, $session::ACCESS_ADMIN)}
			{exportmenu href="?id=%d"|args:$user.id}
		{/if}
	</dd>
	{/if}
</dl>
{/if}

{if $only}







|







24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
	</dd>
	{/foreach}
	{if !$only && !$after}
	<dt>Nombre d'inscriptions pour ce membre</dt>
	<dd>
		{$list->count()}
		{if $session->canAccess($session::SECTION_USERS, $session::ACCESS_ADMIN)}
			{exportmenu href="?id=%d"|args:$user_id}
		{/if}
	</dd>
	{/if}
</dl>
{/if}

{if $only}

Modified src/templates/services/user/subscribe.tpl from [a2b2e804e4] to [956f4af913].

1
2

3

4
5
6
7
8
9
{include file="_head.tpl" title="Inscrire à une activité" current="users/services"}


{include file="services/_nav.tpl" current="save" fee=null service=null}


{form_errors}

{include file="services/user/_service_user_form.tpl" create=true}

{include file="_foot.tpl"}


>

>






1
2
3
4
5
6
7
8
9
10
11
{include file="_head.tpl" title="Inscrire à une activité" current="users/services"}

{if !$dialog}
{include file="services/_nav.tpl" current="save" fee=null service=null}
{/if}

{form_errors}

{include file="services/user/_service_user_form.tpl" create=true}

{include file="_foot.tpl"}

Modified src/templates/users/_nav_user.tpl from [fb08a8590d] to [7397275ec4].

1
2
3
4
5
6
7
8




9
10
11
12
13
14
15
<nav class="tabs">
	<aside>
	{if $session->canAccess($session::SECTION_USERS, $session::ACCESS_WRITE)}
		{linkbutton href="edit.php?id=%d"|args:$id shape="edit" label="Modifier"}
	{/if}
	{if $session->canAccess($session::SECTION_USERS, $session::ACCESS_ADMIN) && $logged_user.id != $id}
		{linkbutton href="delete.php?id=%d"|args:$id shape="delete" label="Supprimer" target="_dialog"}
	{/if}




	</aside>
	<ul>
		<li{if $current == 'details'} class="current"{/if}>{link href="!users/details.php?id=%d"|args:$id label="Fiche membre"}</li>
		<li{if $current == 'services'} class="current"{/if}>{link href="!services/user/?id=%d"|args:$id label="Inscriptions aux activités"}</li>
		<li{if $current == 'reminders'} class="current"{/if}>{link href="!services/reminders/user.php?id=%d"|args:$id label="Rappels envoyés"}</li>
	</ul>
</nav>


|


|


>
>
>
>







1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
<nav class="tabs">
	<aside>
	{if $session->canAccess($session::SECTION_USERS, $session::ACCESS_WRITE) && $current == 'details'}
		{linkbutton href="edit.php?id=%d"|args:$id shape="edit" label="Modifier"}
	{/if}
	{if $session->canAccess($session::SECTION_USERS, $session::ACCESS_ADMIN) && $logged_user.id != $id && $current == 'details'}
		{linkbutton href="delete.php?id=%d"|args:$id shape="delete" label="Supprimer" target="_dialog"}
	{/if}
	{if $session->canAccess($session::SECTION_USERS, $session::ACCESS_WRITE) && $current == 'services'}
		{linkbutton href="!services/user/subscribe.php?user=%d"|args:$id label="Inscrire à une activité" shape="plus" target="_dialog"}
	{/if}

	</aside>
	<ul>
		<li{if $current == 'details'} class="current"{/if}>{link href="!users/details.php?id=%d"|args:$id label="Fiche membre"}</li>
		<li{if $current == 'services'} class="current"{/if}>{link href="!services/user/?id=%d"|args:$id label="Inscriptions aux activités"}</li>
		<li{if $current == 'reminders'} class="current"{/if}>{link href="!services/reminders/user.php?id=%d"|args:$id label="Rappels envoyés"}</li>
	</ul>
</nav>

Modified src/templates/users/details.tpl from [2007f910f2] to [3ae8bf0c70].

18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
	{foreachelse}
	<dd>
		Ce membre n'est inscrit à aucune activité ou cotisation.
	</dd>
	{/foreach}
	<dd>
		{if $session->canAccess($session::SECTION_USERS, $session::ACCESS_WRITE)}
			{linkbutton href="!services/user/subscribe.php?user=%d"|args:$user.id label="Inscrire à une activité" shape="plus"}
		{/if}
	</dd>
	{if $session->canAccess($session::SECTION_USERS, $session::ACCESS_READ)}
		{if !empty($transactions_linked)}
			<dt>Écritures comptables liées</dt>
			<dd><a href="{$admin_url}acc/transactions/user.php?id={$user.id}">{$transactions_linked} écritures comptables liées à ce membre</a></dd>
		{/if}







|







18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
	{foreachelse}
	<dd>
		Ce membre n'est inscrit à aucune activité ou cotisation.
	</dd>
	{/foreach}
	<dd>
		{if $session->canAccess($session::SECTION_USERS, $session::ACCESS_WRITE)}
			{linkbutton href="!services/user/subscribe.php?user=%d"|args:$user.id label="Inscrire à une activité" shape="plus" target="_dialog"}
		{/if}
	</dd>
	{if $session->canAccess($session::SECTION_USERS, $session::ACCESS_READ)}
		{if !empty($transactions_linked)}
			<dt>Écritures comptables liées</dt>
			<dd><a href="{$admin_url}acc/transactions/user.php?id={$user.id}">{$transactions_linked} écritures comptables liées à ce membre</a></dd>
		{/if}

Modified src/templates/users/edit.tpl from [17a564dbb1] to [c068253fb2].

19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
			{/if}

			{if !$user->is_parent}
				{input type="list" name="id_parent" label="Rattacher à un membre" target="!users/selector.php?no_children=1" help="Permet de regrouper les personnes d'un même foyer par exemple. Sélectionner ici le membre responsable." default=$user->getParentSelector() can_delete=true}
			{/if}
			</dl>
		</fieldset>

		{if $user.id != $logged_user.id}
		<p>
			{linkbutton shape="settings" label="Modifier le mot de passe" href="edit_security.php?id=%d"|args:$user.id target="_dialog"}
		</p>
		{/if}
	</aside>

	<fieldset class="main">
		<legend>Fiche du membre</legend>
		<dl>
			{foreach from=$fields item="field"}
				{edit_dynamic_field field=$field user=$user context="edit"}







<
<
<
<
<
<







19
20
21
22
23
24
25






26
27
28
29
30
31
32
			{/if}

			{if !$user->is_parent}
				{input type="list" name="id_parent" label="Rattacher à un membre" target="!users/selector.php?no_children=1" help="Permet de regrouper les personnes d'un même foyer par exemple. Sélectionner ici le membre responsable." default=$user->getParentSelector() can_delete=true}
			{/if}
			</dl>
		</fieldset>






	</aside>

	<fieldset class="main">
		<legend>Fiche du membre</legend>
		<dl>
			{foreach from=$fields item="field"}
				{edit_dynamic_field field=$field user=$user context="edit"}

Modified src/www/admin/services/user/subscribe.php from [a25ca4dd1f] to [0f61b3928c].

59
60
61
62
63
64
65


66
67
68
69
70
71
72
		$users = $copy_service->getUsers($copy_only_paid);
	}
	elseif ($copy_fee) {
		$users = $copy_fee->getUsers($copy_only_paid);
	}

	$su = Service_User::createFromForm($users, $session->getUser()->id, $copy_service ? true : false);



	if (count($users) > 1) {
		$url = ADMIN_URL . 'services/details.php?id=' . $su->id_service;
	}
	else {
		$url = ADMIN_URL . 'services/user/?id=' . $su->id_user;
	}







>
>







59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
		$users = $copy_service->getUsers($copy_only_paid);
	}
	elseif ($copy_fee) {
		$users = $copy_fee->getUsers($copy_only_paid);
	}

	$su = Service_User::createFromForm($users, $session->getUser()->id, $copy_service ? true : false);

	Utils::reloadParentFrameIfDialog();

	if (count($users) > 1) {
		$url = ADMIN_URL . 'services/details.php?id=' . $su->id_service;
	}
	else {
		$url = ADMIN_URL . 'services/user/?id=' . $su->id_user;
	}