#2498 - Metrics - Personal Layers Map #2542
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,7 +7,7 @@ class DT_Metrics_Dynamic_Records_Map extends DT_Metrics_Chart_Base | |
| { | ||
|
|
||
| //slug and title of the top menu folder | ||
| public $base_slug; // lowercase | ||
| public $base_title; | ||
| public $post_type = 'contacts'; | ||
| public $post_types = []; | ||
|
|
@@ -18,17 +18,21 @@ class DT_Metrics_Dynamic_Records_Map extends DT_Metrics_Chart_Base | |
| public $slug = 'dynamic_records_map'; // lowercase | ||
| public $js_object_name = 'wp_js_object'; // This object will be loaded into the metrics.js file by the wp_localize_script. | ||
| public $js_file_name = '/dt-metrics/records/dynamic-records-map.js'; // should be full file name plus extension | ||
| public $permissions = [ 'dt_all_access_contacts', 'view_project_metrics', 'multiplier' ]; | ||
| public $namespace = 'dt-metrics/records'; | ||
| public $base_filter = []; | ||
|
|
||
| public function __construct( $base_slug, $base_title ) { | ||
| if ( !$this->has_permission() ){ | ||
| return; | ||
| } | ||
|
|
||
| $this->base_slug = $base_slug; | ||
| $this->base_title = $base_title; | ||
|
|
||
| parent::__construct(); | ||
|
|
||
| $this->title = __( 'Records Map', 'disciple_tools' ); | ||
|
|
||
| // Build post types array, ignoring some for now. | ||
| // TODO: Only select post types with valid location field types! | ||
|
|
@@ -69,6 +73,8 @@ public function __construct() { | |
| if ( "metrics/$this->base_slug/$this->slug" === $url_path ) { | ||
| add_action( 'wp_enqueue_scripts', [ $this, 'scripts' ], 99 ); | ||
| } | ||
|
|
||
| $this->namespace = "dt-metrics/$this->base_slug/$this->slug"; | ||
| add_action( 'rest_api_init', [ $this, 'add_api_routes' ] ); | ||
| } | ||
|
|
||
|
|
@@ -101,6 +107,7 @@ public function scripts() { | |
| 'map_key' => DT_Mapbox_API::get_key(), | ||
| 'no_map_key_msg' => _x( 'To view this map, a mapbox key is needed; click here to add.', 'install mapbox key to view map', 'disciple_tools' ), | ||
| 'map_mirror' => dt_get_location_grid_mirror( true ), | ||
| 'can_list_all' => in_array( $this->base_slug, [ 'records' ] ), | ||
| 'menu_slug' => $this->base_slug, | ||
| 'post_type' => $this->post_type, | ||
| 'post_types' => $this->post_type_options, | ||
|
|
@@ -183,8 +190,14 @@ public function post_type_geojson( WP_REST_Request $request ){ | |
| break; | ||
| } | ||
|
|
||
| // Determine if record restriction (listing-all) should take effect. | ||
| $params = self::capture_list_all_setting( $params ); | ||
|
|
||
| // Execute request query. | ||
| $response = Disciple_Tools_Mapping_Queries::post_type_geojson( $params['post_type'], $params, $offset, $limit ); | ||
|
|
||
| // Ensure to unset assigned_post_ids for security reasons. | ||
| unset( $params['assigned_post_ids'] ); | ||
| } | ||
|
|
||
| return [ | ||
|
|
@@ -202,7 +215,7 @@ public function cluster_geojson( WP_REST_Request $request ) { | |
| $query = ( isset( $params['query'] ) && !empty( $params['query'] ) ) ? $params['query'] : []; | ||
| $query = dt_array_merge_recursive_distinct( $query, $this->base_filter ); | ||
|
|
||
| return Disciple_Tools_Mapping_Queries::cluster_geojson( $post_type, self::capture_list_all_setting( $query ) ); | ||
| } | ||
|
|
||
|
|
||
|
|
@@ -215,7 +228,7 @@ public function get_grid_totals( WP_REST_Request $request ) { | |
| $post_type = $params['post_type']; | ||
| $query = ( isset( $params['query'] ) && !empty( $params['query'] ) ) ? $params['query'] : []; | ||
| $query = dt_array_merge_recursive_distinct( $query, $this->base_filter ); | ||
| $results = Disciple_Tools_Mapping_Queries::query_location_grid_meta_totals( $post_type, self::capture_list_all_setting( $query ) ); | ||
|
|
||
| $list = []; | ||
| foreach ( $results as $result ) { | ||
|
|
@@ -236,7 +249,7 @@ public function get_list_by_grid_id( WP_REST_Request $request ) { | |
| $query = ( isset( $params['query'] ) && !empty( $params['query'] ) ) ? $params['query'] : []; | ||
| $query = dt_array_merge_recursive_distinct( $query, $this->base_filter ); | ||
|
|
||
| return Disciple_Tools_Mapping_Queries::query_under_location_grid_meta_id( $post_type, $grid_id, self::capture_list_all_setting( $query ) ); | ||
| } | ||
|
|
||
|
|
||
|
|
@@ -252,9 +265,33 @@ public function points_geojson( WP_REST_Request $request ) { | |
| $query = ( isset( $params['query'] ) && !empty( $params['query'] ) ) ? $params['query'] : []; | ||
| $query = dt_array_merge_recursive_distinct( $query, $this->base_filter ); | ||
|
|
||
| return Disciple_Tools_Mapping_Queries::points_geojson( $post_type, self::capture_list_all_setting( $query ) ); | ||
| } | ||
|
|
||
| private function capture_list_all_setting( $params ) { | ||
| if ( !isset( $params['list_all'] ) || !$params['list_all'] ) { | ||
| $params['list_all'] = false; | ||
| $params['assigned_post_ids'] = self::list_assigned_post_ids( ( ( $params['post_type'] === 'system-users' ) ? 'contacts' : $params['post_type'] ), get_current_user_id() ); | ||
| } else { | ||
| $params['list_all'] = true; | ||
| $params['assigned_post_ids'] = []; | ||
| } | ||
|
|
||
| return $params; | ||
| } | ||
|
|
||
| private function list_assigned_post_ids( $post_type, $user_id, $fields = [ 'ID' ], $limit = 500000 ): array { | ||
|
There was a problem hiding this comment. @kodinkat, lets add an extra param post_type_geojson with the restrict param and add the sql directly if it is present. |
||
| $assigned_posts = DT_Posts::search_viewable_post( $post_type, [ | ||
| 'limit' => $limit, | ||
| 'fields' => $fields, | ||
| 'assigned_to' => [ $user_id ], | ||
| 'subassigned' => [ $user_id ], | ||
| 'shared_with' => [ $user_id ] | ||
| ] ); | ||
|
|
||
| return array_map( function ( $post ) { | ||
| return $post->ID; | ||
| }, $assigned_posts['posts'] ?? [] ); | ||
| } | ||
|
|
||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@kodinkat
multiplieris not a permission. Please explain