Overview
Comment:Don't order by price, but by label
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk | stable
Files: files | file ages | folders
SHA3-256: 32e3b9404e0e3eab74c8cabd73d621dbfcaf657342da62ffe12c2fcd6bf560a8
User & Date: bohwaz on 2021-11-30 17:16:55
Other Links: manifest | tags
Context
2021-11-30
17:19
Add help button to menu check-in: f48bc88eab user: bohwaz tags: trunk, stable
17:16
Don't order by price, but by label check-in: 32e3b9404e user: bohwaz tags: trunk, stable
14:56
Clear graph cache after import check-in: eead5b5fb1 user: bohwaz tags: trunk, stable
Changes

Modified src/include/lib/Garradin/Services/Fees.php from [98acb50ff8] to [08077bc682].

55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
		foreach ($result as &$row) {
			if ($row->formula) {
				$sql = sprintf('SELECT %s FROM membres WHERE id = %d;', $row->formula, $user_id);
				$row->user_amount = $db->firstColumn($sql);
			}
		}

		usort($result, function ($a, $b) {
			if ($a->user_amount == $b->user_amount) {
				return 0;
			}

			return $a->user_amount > $b->user_amount ? 1 : -1;
		});

		return $result;
	}

	public function listWithStats()
	{
		$db = DB::getInstance();
		$hidden_cats = array_keys(Categories::listHidden());







<
<
<
<
<
<
<
<







55
56
57
58
59
60
61








62
63
64
65
66
67
68
		foreach ($result as &$row) {
			if ($row->formula) {
				$sql = sprintf('SELECT %s FROM membres WHERE id = %d;', $row->formula, $user_id);
				$row->user_amount = $db->firstColumn($sql);
			}
		}









		return $result;
	}

	public function listWithStats()
	{
		$db = DB::getInstance();
		$hidden_cats = array_keys(Categories::listHidden());

Modified src/templates/services/user/add.tpl from [f7d8e48aef] to [e38a83f3e8].

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

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

{form_errors}

{if !$user_id}
<form method="post" action="{$self_url}" data-focus="1">

	<fieldset>
		<legend>Inscrire un membre à une activité</legend>
		<dl>
			{input type="list" name="user" required=1 label="Sélectionner un membre" default=$selected_user target="membres/selector.php"}
		</dl>
	</fieldset>







|







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

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

{form_errors}

{if !$user_id}
<form method="post" action="{$self_url}">

	<fieldset>
		<legend>Inscrire un membre à une activité</legend>
		<dl>
			{input type="list" name="user" required=1 label="Sélectionner un membre" default=$selected_user target="membres/selector.php"}
		</dl>
	</fieldset>