Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#2434 - Dynamic Metrics - Genmapper - Show Data Layers #2515

Merged
merged 12 commits into from
Jul 17, 2024
Merged

#2434 - Dynamic Metrics - Genmapper - Show Data Layers #2515

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
df6ad63
Introduced data layer field filters for generational tree metrics
kodinkat Jun 12, 2024
1fda503
Addressed sql placeholders code smells
kodinkat Jun 13, 2024
bd4dacb
Ignore string array escaping
kodinkat Jun 13, 2024
b38aa41
Revised ui and data layer flow logic
kodinkat Jul 1, 2024
cc37398
Introduced displaying of field icons
kodinkat Jul 5, 2024
2759dd0
Merge branch 'develop' of https://github.com/DiscipleTools/disciple-t…
kodinkat Jul 10, 2024
0e003a2
Added switch to toggle between labels and icons
kodinkat Jul 11, 2024
32966c8
wording
corsacca Jul 12, 2024
360e579
Enforce data layer display ordering
kodinkat Jul 12, 2024
f8bb565
Hide data layer settings by default + Also display status field label
kodinkat Jul 12, 2024
1d208a1
Plus icon count for each field line + White icons with fixed size
kodinkat Jul 17, 2024
737b811
Ensure mdi font icons default to white
kodinkat Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
Addressed sql placeholders code smells
  • Loading branch information
@kodinkat
kodinkat committed Jun 13, 2024
commit 1fda5033bdc80b6f4cdc712515a992fd03b3486e
4 changes: 2 additions & 2 deletions dt-metrics/records/genmap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,11 +366,11 @@ public function package_data_layer_post_fields( $query, $post_type, $post_settin
$post_ids_array_sql = dt_array_to_sql( $post_ids, true );
$data_layer_fields_array_sql = dt_array_to_sql( $data_layer_fields );

$query = $wpdb->get_results( $wpdb->prepare( "
$query = $wpdb->get_results( "
SELECT post_id, meta_key, meta_value
FROM $wpdb->postmeta
WHERE post_id IN ($post_ids_array_sql) AND meta_key IN ($data_layer_fields_array_sql)
" ), ARRAY_A );
", ARRAY_A );

// Package data layer post fields.
foreach ( $query as $postmeta ) {
Expand Down