improved look of pronoun-table
Christian Fraß commited on 2016-08-08 22:04:51
Zeige 1 geänderte Dateien mit 38 Einfügungen und 5 Löschungen.
- source/content/personal_pronouns.html.php eff6fcc..bf48220
| ... | ... |
@@ -18,43 +18,76 @@ function convert_genus($genus) {return [0 => "common", 1 => "masculine", 2 => "f
|
| 18 | 18 |
|
| 19 | 19 |
$data = $data_pronouns["words"]; |
| 20 | 20 |
{
|
| 21 |
+ {
|
|
| 22 |
+ if (false) |
|
| 21 | 23 |
{
|
| 22 | 24 |
$data = sql_cross($data, $data_common["counts"]); |
| 23 | 25 |
$data = sql_select($data, function ($row) {return ($row["count_id"] == $row["id"]);});
|
| 24 | 26 |
$data = sql_delete($data, ["count_id", "id"]); |
| 25 | 27 |
$data = sql_rename($data, "name", "count_name"); |
| 26 | 28 |
} |
| 29 |
+ else |
|
| 30 |
+ {
|
|
| 31 |
+ $data = sql_rename($data, "count_id", "count_name"); |
|
| 32 |
+ } |
|
| 33 |
+ } |
|
| 34 |
+ {
|
|
| 35 |
+ if (false) |
|
| 27 | 36 |
{
|
| 28 | 37 |
$data = sql_cross($data, $data_common["persons"]); |
| 29 | 38 |
$data = sql_select($data, function ($row) {return ($row["person_id"] == $row["id"]);});
|
| 30 | 39 |
$data = sql_delete($data, ["person_id", "id"]); |
| 31 | 40 |
$data = sql_rename($data, "name", "person_name"); |
| 32 | 41 |
} |
| 42 |
+ else |
|
| 43 |
+ {
|
|
| 44 |
+ $data = sql_rename($data, "person_id", "person_name"); |
|
| 45 |
+ } |
|
| 46 |
+ } |
|
| 47 |
+ {
|
|
| 48 |
+ if (false) |
|
| 33 | 49 |
{
|
| 34 | 50 |
$data = sql_cross($data, $data_common["genders"]); |
| 35 | 51 |
$data = sql_select($data, function ($row) {return ($row["gender_id"] == $row["id"]);});
|
| 36 | 52 |
$data = sql_delete($data, ["gender_id", "id"]); |
| 37 | 53 |
$data = sql_rename($data, "name", "gender_name"); |
| 38 | 54 |
} |
| 55 |
+ else |
|
| 56 |
+ {
|
|
| 57 |
+ $data = sql_rename($data, "gender_id", "gender_name"); |
|
| 58 |
+ } |
|
| 59 |
+ } |
|
| 60 |
+ {
|
|
| 61 |
+ if (false) |
|
| 39 | 62 |
{
|
| 40 | 63 |
$data = sql_cross($data, $data_pronouns["types"]); |
| 41 |
- /* |
|
| 42 | 64 |
$data = sql_select($data, function ($row) {return ($row["type_id"] == $row["id"]);});
|
| 43 | 65 |
$data = sql_delete($data, ["type_id", "id"]); |
| 44 | 66 |
$data = sql_rename($data, "name", "type_name"); |
| 45 |
- */ |
|
| 67 |
+ } |
|
| 68 |
+ else |
|
| 69 |
+ {
|
|
| 46 | 70 |
$data = sql_rename($data, "type_id", "type_name"); |
| 47 | 71 |
} |
| 72 |
+ } |
|
| 73 |
+ {
|
|
| 74 |
+ if (false) |
|
| 48 | 75 |
{
|
| 49 | 76 |
$data = sql_cross($data, $data_common["cases"]); |
| 50 |
- /* |
|
| 51 | 77 |
$data = sql_select($data, function ($row) {return ($row["case_id"] == $row["id"]);});
|
| 52 | 78 |
$data = sql_delete($data, ["case_id", "id"]); |
| 53 | 79 |
$data = sql_rename($data, "name", "case_name"); |
| 54 |
- */ |
|
| 80 |
+ } |
|
| 81 |
+ else |
|
| 82 |
+ {
|
|
| 55 | 83 |
$data = sql_rename($data, "case_id", "case_name"); |
| 56 | 84 |
} |
| 57 | 85 |
} |
| 86 |
+ } |
|
| 87 |
+ |
|
| 88 |
+ {
|
|
| 89 |
+ // $data = sql_select($data, function ($row) {return ($row["case_name"] != "pos");});
|
|
| 90 |
+ } |
|
| 58 | 91 |
|
| 59 | 92 |
$table = new class_table |
| 60 | 93 |
( |
| ... | ... |
@@ -97,7 +130,7 @@ function convert_genus($genus) {return [0 => "common", 1 => "masculine", 2 => "f
|
| 97 | 130 |
}, |
| 98 | 131 |
"data_formatter" => function ($value) |
| 99 | 132 |
{
|
| 100 |
- switch (-1) |
|
| 133 |
+ switch (1) |
|
| 101 | 134 |
{
|
| 102 | 135 |
case 0: |
| 103 | 136 |
{
|
| 104 | 137 |