PluginProbe
Visualizer – Tables & Charts Manager with Built-in AI Generator / 3.10.8
Visualizer – Tables & Charts Manager with Built-in AI Generator v3.10.8
4.0.7 4.0.6 4.0.5 4.0.4 4.0.3 3.0.5 3.0.6 3.0.7 3.0.8 3.0.9 3.1.0 3.1.1 3.1.2 3.1.3 3.10.0 3.10.1 3.10.10 3.10.11 3.10.12 3.10.13 3.10.14 3.10.15 3.10.2 3.10.3 3.10.4 All 148 releases
← All changes | classes/Visualizer/Render/Page/Data.php +61 -338 3.0.63.10.8 View file →
@@ -37,19 +37,38 @@
37 37 * @access protected
38 38 */
39 39 protected function _renderContent() {
40 40 // Added by Ash/Upwork
41 - if ( VISUALIZER_PRO ) {
42 - global $Visualizer_Pro;
43 - $Visualizer_Pro->_addEditor( $this->chart->ID );
44 - if ( method_exists( $Visualizer_Pro, '_addFilterWizard' ) ) {
45 - $Visualizer_Pro->_addFilterWizard( $this->chart->ID );
41 + if ( Visualizer_Module::can_show_feature( 'simple-editor' ) ) {
42 + Visualizer_Render_Layout::show( 'simple-editor-screen', $this->chart->ID );
43 + }
44 +
45 + if ( Visualizer_Module::is_pro() ) {
46 + do_action( 'visualizer_add_editor_etc', $this->chart->ID );
47 +
48 + if ( Visualizer_Module::is_pro() && Visualizer_Module::is_pro_older_than( '1.9.0' ) ) {
49 + global $Visualizer_Pro;
50 + $Visualizer_Pro->_addEditor( $this->chart->ID );
51 + if ( method_exists( $Visualizer_Pro, '_addFilterWizard' ) ) {
52 + $Visualizer_Pro->_addFilterWizard( $this->chart->ID );
53 + }
46 54 }
47 55 }
56 +
57 + $this->add_additional_content();
58 +
48 59 // Added by Ash/Upwork
60 + if ( Visualizer_Module::is_pro() ) {
61 + echo '<div id="chart_wrapper_canvas">';
62 + echo '<div id="control_wrapper_canvas"></div>';
63 + }
49 64 echo '<div id="canvas">';
50 65 echo '<img src="', VISUALIZER_ABSURL, 'images/ajax-loader.gif" class="loader">';
51 66 echo '</div>';
67 + if ( Visualizer_Module::is_pro() ) {
68 + echo '</div>';
69 + }
70 + echo $this->custom_css;
52 71 }
53 72
54 73 /**
55 74 * Renders sidebar content.
@@ -58,347 +77,33 @@
58 77 *
59 78 * @access protected
60 79 */
61 80 protected function _renderSidebarContent() {
62 - $upload_link = add_query_arg(
63 - array(
64 - 'action' => Visualizer_Plugin::ACTION_UPLOAD_DATA,
65 - 'nonce' => wp_create_nonce(),
66 - 'chart' => $this->chart->ID,
67 - ), admin_url( 'admin-ajax.php' )
68 - );
69 81 ?>
70 - <span id="visualizer-chart-id" data-id="<?php echo $this->chart->ID; ?>"></span>
71 - <iframe id="thehole" name="thehole"></iframe>
72 - <ul class="viz-group-wrapper full-height">
73 - <li class="viz-group viz-group-category open" id="vz-chart-source">
74 - <div class="viz-group-header">
75 - <h2 class="viz-group-title viz-main-group"><?php _e( 'Chart Data', 'visualizer' ); ?></h2>
76 - </div>
77 - <ul class="viz-group-content">
78 - <ul class="viz-group-wrapper">
79 - <li class="viz-group">
80 - <h2 class="viz-group-title viz-sub-group visualizer-src-tab"><?php _e( 'Import data from file', 'visualizer' ); ?></h2>
81 - <div class="viz-group-content">
82 - <p class="viz-group-description"><?php esc_html_e( 'Select and upload your data CSV file here. The first row of the CSV file should contain the column headings. The second one should contain series type (string, number, boolean, date, datetime, timeofday).', 'visualizer' ); ?></p>
83 - <p class="viz-group-description"><?php echo sprintf( __( 'If you are unsure about how to format your data CSV then please take a look at this sample: %1$s %2$s%3$s', 'visualizer' ), '<a href="' . VISUALIZER_ABSURL . 'samples/' . $this->type . '.csv" target="_blank">', $this->type, '.csv</a>' ); ?></p>
84 - <form id="vz-csv-file-form" action="<?php echo $upload_link; ?>" method="post"
85 - target="thehole" enctype="multipart/form-data">
86 - <input type="hidden" id="remote-data" name="remote_data">
87 - <div class="">
88 - <input type="file" id="csv-file" name="local_data">
89 - </div>
90 - <input type="button" class="button button-primary" id="vz-import-file"
91 - value="<?php _e( 'Import', 'visualizer' ); ?>">
92 - </form>
93 - </div>
94 - </li>
95 - <li class="viz-group visualizer-import-url">
96 - <h2 class="viz-group-title viz-sub-group visualizer-src-tab"><?php _e( 'Import data from URL', 'visualizer' ); ?></h2>
97 - <ul class="viz-group-content">
98 - <li class="viz-subsection">
99 - <span class="viz-section-title"><?php _e( 'One time import', 'visualizer' ); ?></span>
82 + <div id="viz-tabs">
83 + <ul>
84 + <li><a href="#viz-tab-basic-content" id="viz-tab-basic"><?php _e( 'Source', 'visualizer' ); ?></a></li>
85 + <li><a href="#viz-tab-advanced-content" id="viz-tab-advanced"><?php _e( 'Settings', 'visualizer' ); ?></a></li>
86 + <li><a href="#viz-tab-help-content" id="viz-tab-help"><?php _e( 'Help', 'visualizer' ); ?></a></li>
87 + </ul>
88 + <div id="viz-tab-basic-content"><?php Visualizer_Render_Layout::show( 'tab-basic', $this->chart->ID ); ?></div>
89 + <div id="viz-tab-advanced-content"><?php Visualizer_Render_Layout::show( 'tab-advanced', $this->chart->ID, $this->sidebar ); ?></div>
90 + <div id="viz-tab-help-content"><?php Visualizer_Render_Layout::show( 'tab-help', $this->chart->ID ); ?></div>
91 + </div>
100 92
101 - <div class="viz-section-items section-items">
102 - <p class="viz-group-description"><?php _e( 'You can use this to import data from a remote CSV file. The first row of the CSV file should contain the column headings. The second one should contain series type (string, number, boolean, date, datetime, timeofday).', 'visualizer' ); ?> </p>
103 - <p class="viz-group-description"><?php echo sprintf( __( 'If you are unsure about how to format your data CSV then please take a look at this sample: %1$s %2$s%3$s', 'visualizer' ), '<a href="' . VISUALIZER_ABSURL . 'samples/' . $this->type . '.csv" target="_blank">', $this->type, '.csv</a>' ); ?></p>
104 - <p class="viz-group-description"> <?php _e( 'You can also import data from Google Spreadsheet, for more info check <a href="https://github.com/Codeinwp/visualizer/wiki/How-can-I-populate-data-from-Google-Spreadsheet%3F" target="_blank" >this</a> tutorial', 'visualizer' ); ?></p>
105 - <form id="vz-one-time-import" action="<?php echo $upload_link; ?>" method="post"
106 - target="thehole" enctype="multipart/form-data">
107 - <div class="remote-file-section">
108 - <input type="url" id="remote-data" name="remote_data"
109 - placeholder="<?php esc_html_e( 'Please enter the URL of CSV file', 'visualizer' ); ?>"
110 - class="visualizer-input">
111 -
112 - </div>
113 - <input type="button" id="view-remote-file" class="button button-primary"
114 - value="<?php _e( 'Import', 'visualizer' ); ?>">
115 - </form>
116 - </div>
117 - </li>
118 - <li class="viz-subsection <?php echo apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature', 'schedule-chart' ); ?>">
119 - <span class="viz-section-title visualizer-import-url-schedule"><?php _e( 'Schedule Import', 'visualizer' ); ?>
120 - <span
121 - class="dashicons dashicons-lock"></span></span>
122 - <div class="viz-section-items section-items">
123 - <p class="viz-group-description"><?php _e( 'You can choose here to synchronize your chart data with a remote CSV file.', 'visualizer' ); ?> </p>
124 - <p class="viz-group-description"> <?php _e( 'You can also synchronize with your Google Spreadsheet file, for more info check <a href="https://github.com/Codeinwp/visualizer/wiki/How-can-I-populate-data-from-Google-Spreadsheet%3F" target="_blank" >this</a> tutorial', 'visualizer' ); ?></p>
125 - <p class="viz-group-description"> <?php _e( 'We will update the chart data based on your time interval preference by overwritting the current data with the one from the URL.', 'visualizer' ); ?></p>
126 - <form id="vz-schedule-import" action="<?php echo $upload_link; ?>" method="post"
127 - target="thehole" enctype="multipart/form-data">
128 - <div class="remote-file-section">
129 - <input type="url" id="vz-schedule-url" name="remote_data"
130 - value="<?php echo get_post_meta( $this->chart->ID, Visualizer_Plugin::CF_CHART_URL, true ); ?>"
131 - placeholder="<?php esc_html_e( 'Please enter the URL of CSV file', 'visualizer' ); ?>"
132 - class="visualizer-input visualizer-remote-url">
133 - <p class="viz-group-description"><?php _e( 'How often do you want to check the url', 'visualizer' ); ?></p>
134 - <select name="vz-import-time" id="vz-import-time"
135 - class="visualizer-select">
136 - <?php
137 - $hours = get_post_meta( $this->chart->ID, Visualizer_Plugin::CF_CHART_SCHEDULE, true );
138 - $schedules = array(
139 - '1' => __( 'Each hour', 'visualizer' ),
140 - '12' => __( 'Each 12 hours', 'visualizer' ),
141 - '24' => __( 'Each day', 'visualizer' ),
142 - '36' => __( 'Each 3 days', 'visualizer' ),
143 - );
144 - foreach ( $schedules as $num => $name ) {
145 - $extra = $num == $hours ? 'selected' : '';
146 - ?>
147 - <option value="<?php echo $num; ?>" <?php echo $extra; ?>><?php echo $name; ?></option>
148 - <?php
149 - }
150 - ?>
151 - </select>
152 - </div>
153 - <input type="button" id="vz-save-schedule" class="button button-primary"
154 - value="<?php _e( 'Save schedule', 'visualizer' ); ?>">
155 -
156 - <?php echo apply_filters( 'visualizer_pro_upsell', '', 'schedule-chart' ); ?>
157 - </form>
158 - </div>
159 - </li>
160 - </ul>
161 - </li>
162 - <li class="viz-group <?php echo apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature' ); ?>">
163 - <h2 class="viz-group-title viz-sub-group"
164 - data-current="chart"><?php _e( 'Import from other chart', 'visualizer' ); ?><span
165 - class="dashicons dashicons-lock"></span></h2>
166 - <div class="viz-group-content edit-data-content">
167 - <div>
168 - <p class="viz-group-description"><?php _e( 'You can import here data from your previously created charts', 'visualizer' ); ?></p>
169 - <form>
170 - <select name="vz-import-from-chart" id="chart-id" class="visualizer-select">
171 - <?php
172 - $fetch_link = add_query_arg(
173 - array(
174 - 'action' => ( VISUALIZER_PRO ) ? Visualizer_Pro::ACTION_FETCH_DATA : '',
175 - 'nonce' => wp_create_nonce(),
176 - ), admin_url( 'admin-ajax.php' )
177 - );
178 - $query_args_charts = array(
179 - 'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
180 - 'posts_per_page' => 300,
181 - 'no_found_rows' => true,
182 - );
183 - $charts = array();
184 - $query = new WP_Query( $query_args_charts );
185 - while ( $query->have_posts() ) {
186 - $chart = $query->next_post();
187 - $settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
188 - ?>
189 - <option value="<?php echo $chart->ID; ?>"><?php echo empty( $settings['title'] ) ? '#' . $chart->ID : $settings['title']; ?></option>
190 - <?php
191 - }
192 - ?>
193 -
194 - </select>
195 - </form>
196 - <input type="button" id="existing-chart" class="button button-primary"
197 - value="<?php _e( 'Import Chart', 'visualizer' ); ?>"
198 - data-viz-link="<?php echo $fetch_link; ?>">
199 - <?php echo apply_filters( 'visualizer_pro_upsell', '' ); ?>
200 - </div>
201 - </div>
202 - </li>
203 -
204 - <li class="viz-group <?php echo apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature', 'schedule-chart' ); ?> ">
205 - <h2 class="viz-group-title viz-sub-group"><?php _e( 'Import from WordPress', 'visualizer' ); ?><span
206 - class="dashicons dashicons-lock"></span></h2>
207 - <div class="viz-group-content edit-data-content">
208 - <div>
209 - <p class="viz-group-description"><?php _e( 'You can import here data from WordPress', 'visualizer' ); ?></p>
210 - <input type="button" id="filter-chart-button" class="button button-primary "
211 - value="<?php _e( 'Create Filters', 'visualizer' ); ?>" data-current="chart"
212 - data-t-filter="<?php _e( 'Show Chart', 'visualizer' ); ?>"
213 - data-t-chart="<?php _e( 'Create Filters', 'visualizer' ); ?>">
214 - <?php echo apply_filters( 'visualizer_pro_upsell', '', 'schedule-chart' ); ?>
215 - </div>
216 - </div>
217 - </li>
218 -
219 - <?php
220 - // we will auto-open the manual data feature but only when pro is active.
221 - $pro_class = apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature' );
222 - ?>
223 - <li class="viz-group <?php echo $pro_class; ?> <?php echo empty( $pro_class ) ? 'open' : ''; ?> ">
224 - <h2 class="viz-group-title viz-sub-group visualizer-editor-tab"
225 - data-current="chart"><?php _e( 'Manual Data', 'visualizer' ); ?><span
226 - class="dashicons dashicons-lock"></span></h2>
227 - <form id="editor-form" action="<?php echo $upload_link; ?>" method="post" target="thehole">
228 - <input type="hidden" id="chart-data" name="chart_data">
229 - <input type="hidden" id="chart-data-src" name="chart_data_src">
230 - </form>
231 -
232 - <div class="viz-group-content edit-data-content">
233 - <div>
234 - <p class="viz-group-description"><?php _e( 'You can manually edit the chart data using the spreadsheet like editor.', 'visualizer' ); ?></p>
235 - <input type="button" id="editor-chart-button" class="button button-primary "
236 - value="<?php _e( 'View Editor', 'visualizer' ); ?>" data-current="chart"
237 - data-t-editor="<?php _e( 'Show Chart', 'visualizer' ); ?>"
238 - data-t-chart="<?php _e( 'View Editor', 'visualizer' ); ?>">
239 -
240 - <?php echo apply_filters( 'visualizer_pro_upsell', '' ); ?>
241 - </div>
242 - </div>
243 - </li>
244 - </ul>
245 - </li>
246 - </ul>
247 - <li class="viz-group viz-group-category bottom-fixed sidebar-footer-link" id="vz-chart-settings">
248 - <h2><span class="dashicons dashicons-admin-tools"></span><?php _e( 'Advanced', 'visualizer' ); ?></h2>
249 - <div class="viz-group-header">
250 - <button class="customize-section-back" tabindex="0"></button>
251 - <h3 class="viz-group-title viz-main-group"><?php _e( 'Chart Settings', 'visualizer' ); ?></h3>
252 - </div>
253 - <ul class="viz-group-content">
254 - <form id="settings-form" action="<?php echo add_query_arg( 'nonce', wp_create_nonce() ); ?>"
255 - method="post">
256 - <?php echo $this->sidebar; ?>
257 - </form>
258 - </ul>
259 - </li>
260 -
261 - <?php $this->getPermissionsLink( $this->chart->ID ); ?>
262 -
263 - <li class="viz-group bottom-fixed" id="vz-chart-copyright">Visualizer &copy; <?php echo date( 'Y', current_time( 'timestamp' ) ); ?></li>
264 - </ul>
93 + <li class="viz-group bottom-fixed" id="vz-chart-copyright">
94 + Hate it? Love it? <a href="https://wordpress.org/support/plugin/visualizer/reviews/#new-post" target="_blank">Rate it!</a>
95 + <br/>
96 + Visualizer &copy;
265 97 <?php
266 - // changed by Ash/Upwork
267 - }
268 -
269 - /**
270 - * Generates the permissions link.
271 - *
272 - * @access private
273 - * @param int $id The chart id.
274 - */
275 - private function getPermissionsLink( $id ) {
276 - $permissions = apply_filters( 'visualizer_pro_get_permissions', null, $id );
277 - if ( $permissions ) {
278 - foreach ( $permissions as $k => $v ) {
279 - $this->$k = $v;
280 - }
281 - }
282 -?>
283 - <li class="viz-group viz-group-category bottom-fixed sidebar-footer-link" id="vz-chart-permissions">
284 - <h2><span class="dashicons dashicons-admin-users"></span><?php _e( 'Permissions', 'visualizer' ); ?></h2>
285 - <div class="viz-group-header">
286 - <button class="customize-section-back" tabindex="0"></button>
287 - <h3 class="viz-group-title viz-main-group"><?php _e( 'Chart Settings', 'visualizer' ); ?></h3>
288 - </div>
289 - <ul class="viz-group-content">
290 - <form id="permissions-form" target="thehole" action="
291 - <?php
292 - echo add_query_arg(
293 - array(
294 - 'nonce' => wp_create_nonce(),
295 - 'tab' => 'permissions',
296 - ), remove_query_arg( 'tab', $_SERVER['REQUEST_URI'] )
297 - );
298 -?>
299 -" method="post">
300 - <?php $this->permissionsSidebar(); ?>
301 - </form>
302 - </ul>
98 + // phpcs:ignore WordPress.DateTime.RestrictedFunctions.date_date, WordPress.DateTime.CurrentTimeTimestamp.Requested
99 + echo date( 'Y', current_time( 'timestamp' ) );
100 + ?>
303 101 </li>
304 -<?php
102 + <?php
305 103 }
306 104
307 105 /**
308 - * Generates the permissions form.
309 - *
310 - * @access private
311 - */
312 - private function permissionsSidebar() {
313 - Visualizer_Render_Sidebar::_renderGroupStart(
314 - esc_html__( 'Who can see this chart?', 'visualizer' ) . '<span
315 - class="dashicons dashicons-lock"></span>', '', apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature', 'chart-permissions' )
316 - );
317 - Visualizer_Render_Sidebar::_renderSectionStart();
318 - Visualizer_Render_Sidebar::_renderSectionDescription( esc_html__( 'Select who can view the chart on the front-end.', 'visualizer' ) );
319 -
320 - if ( ! isset( $this->permissions['read'] ) ) {
321 - $this->permissions['read'] = 'all';
322 - }
323 -
324 - Visualizer_Render_Sidebar::_renderSelectItem(
325 - '',
326 - 'permissions[read]',
327 - $this->permissions['read'],
328 - array(
329 - 'all' => esc_html__( 'All Users', 'visualizer' ),
330 - 'users' => esc_html__( 'Select Users', 'visualizer' ),
331 - 'roles' => esc_html__( 'Select Roles', 'visualizer' ),
332 - ),
333 - '',
334 - false,
335 - array( 'visualizer-permission', 'visualizer-permission-type', 'visualizer-permission-read' ),
336 - array(
337 - 'permission-type' => 'read',
338 - )
339 - );
340 -
341 - $options = apply_filters( 'visualizer_pro_get_permissions_data', array(), isset( $this->permissions['read'] ) ? $this->permissions['read'] : 'roles' );
342 -
343 - Visualizer_Render_Sidebar::_renderSelectItem(
344 - '',
345 - 'permissions[read-specific][]',
346 - isset( $this->permissions['read-specific'] ) ? $this->permissions['read-specific'] : array(),
347 - $options,
348 - '',
349 - true,
350 - array( 'visualizer-permission', 'visualizer-permission-specific', 'visualizer-permission-read-specific' )
351 - );
352 - Visualizer_Render_Sidebar::_renderSectionEnd( apply_filters( 'visualizer_pro_upsell', 'only-pro-feature', 'chart-permissions' ) );
353 - Visualizer_Render_Sidebar::_renderGroupEnd();
354 -
355 - Visualizer_Render_Sidebar::_renderGroupStart(
356 - esc_html__( 'Who can edit this chart?', 'visualizer' ) . '<span
357 - class="dashicons dashicons-lock"></span>', '', apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature', 'chart-permissions' )
358 - );
359 - Visualizer_Render_Sidebar::_renderSectionStart();
360 - Visualizer_Render_Sidebar::_renderSectionDescription( esc_html__( 'Select who can edit the chart on the front-end.', 'visualizer' ) );
361 -
362 - if ( ! isset( $this->permissions['edit'] ) ) {
363 - $this->permissions['edit'] = 'roles';
364 - $this->permissions['edit-specific'] = 'administrator';
365 - }
366 -
367 - Visualizer_Render_Sidebar::_renderSelectItem(
368 - '',
369 - 'permissions[edit]',
370 - $this->permissions['edit'],
371 - array(
372 - 'all' => esc_html__( 'All Users', 'visualizer' ),
373 - 'users' => esc_html__( 'Select Users', 'visualizer' ),
374 - 'roles' => esc_html__( 'Select Roles', 'visualizer' ),
375 - ),
376 - '',
377 - false,
378 - array( 'visualizer-permission', 'visualizer-permission-type', 'visualizer-permission-edit' ),
379 - array(
380 - 'permission-type' => 'edit',
381 - )
382 - );
383 -
384 - $options = apply_filters( 'visualizer_pro_get_permissions_data', array(), isset( $this->permissions['edit'] ) ? $this->permissions['edit'] : 'roles' );
385 -
386 - Visualizer_Render_Sidebar::_renderSelectItem(
387 - '',
388 - 'permissions[edit-specific][]',
389 - isset( $this->permissions['edit-specific'] ) ? $this->permissions['edit-specific'] : array(),
390 - $options,
391 - '',
392 - true,
393 - array( 'visualizer-permission', 'visualizer-permission-specific', 'visualizer-permission-edit-specific' )
394 - );
395 - Visualizer_Render_Sidebar::_renderSectionEnd( apply_filters( 'visualizer_pro_upsell', 'only-pro-feature', 'chart-permissions' ) );
396 - Visualizer_Render_Sidebar::_renderGroupEnd();
397 -
398 - }
399 -
400 - /**
401 106 * Renders toolbar content.
402 107 *
403 108 * @since 1.0.0
404 109 *
@@ -408,13 +113,31 @@
408 113 // don't show back button at all.
409 114 // NOTE: We can't be selective on the post_status here because when a new chart reaches the settings screen, its status changes to publish.
410 115 if ( ! VISUALIZER_SKIP_CHART_TYPE_PAGE ) {
411 116 echo '<div class="toolbar-div">';
412 - echo '<a class="button button-large" href="', add_query_arg( 'tab', 'types' ), '">';
117 + echo '<a class="button button-large" href="', esc_url( add_query_arg( 'tab', 'types' ) ), '">';
413 118 esc_html_e( 'Back', 'visualizer' );
414 119 echo '</a>';
415 120 echo '</div>';
416 121 }
417 122 echo '<input type="submit" id="settings-button" class="button button-primary button-large push-right" value="', $this->button, '">';
123 + if ( isset( $this->cancel_button ) ) {
124 + echo '<input type="submit" id="cancel-button" class="button button-secondary button-large push-right" value="', $this->cancel_button, '">';
125 + }
126 + }
127 +
128 + /**
129 + * Renders the additional content.
130 + *
131 + * @access private
132 + */
133 + private function add_additional_content() {
134 + $source = strtolower( get_post_meta( $this->chart->ID, Visualizer_Plugin::CF_SOURCE, true ) );
135 + $query = '';
136 + if ( 'visualizer_source_query' === $source ) {
137 + $query = get_post_meta( $this->chart->ID, Visualizer_Plugin::CF_DB_QUERY, true );
138 + }
139 + Visualizer_Render_Layout::show( 'db-query', $query, $this->chart->ID );
140 + Visualizer_Render_Layout::show( 'json-screen', $this->chart->ID );
418 141 }
419 142
420 143 }