Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/gitdedalo/v6.4.0_beta' int…
Browse files Browse the repository at this point in the history 
…o v6.4.0_beta
  • Loading branch information
Paco committed Jan 6, 2025
2 parents 864df54 + 06ec33a commit 8dbeb19
Show file tree
Hide file tree
Showing 16 changed files with 565 additions and 347 deletions.
212 changes: 106 additions & 106 deletions core/api/v1/common/class.dd_core_api.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1670,111 +1670,111 @@ private static function build_json_rows(object $rqo) : object {
// check if the search has a dataframe associated (time_machine of the component with dataframe)
// when the component has a dataframe need to be re_created using his own data with the dataframe data
// it will be showed as an unique component, the main component and his dataframe
if( $ddo_source->mode === 'tm'
&& isset($ddo_source->has_dataframe)
&& $ddo_source->has_dataframe=== true ){

$original_limit = $sqo->limit;
$original_offset = $sqo->offset;
// set the limit and offset to 0 to search all data in time_machine
$sqo->limit = 0;
$sqo->offset = 0;
$full_data = [];

// 1 first get the data of the main component
// using the sqo sent by the client
$source_sections = sections::get_instance(
null, // ?array $ar_locators
$sqo, // object $search_query_object = null
$tipo, // string $caller_tipo = null (section/portal)
$mode, // string $mode = 'list'
$lang // string $lang = DEDALO_DATA_NOLAN
);
$full_data = array_merge($full_data, $source_sections->get_dato());

// 2 get the data of his dataframe
$original_ddo = array_find($rqo->show->ddo_map ?? [], function($item){
return isset($item->has_dataframe) && $item->has_dataframe===true;
});
if (!is_object($original_ddo)) {
debug_log(__METHOD__
. " Error: original_ddo (has_dataframe) not found in ddo_map! " . PHP_EOL
. ' $rqo->show->ddo_map: ' . to_string($rqo->show->ddo_map)
, logger::ERROR
);
}else if ( isset($original_ddo->dataframe_ddo) ) {
$dataframe_ddo = $original_ddo->dataframe_ddo;
// clone the $sqo to change without changes the original
// the sqo will be set with the dataframe tipo and lg-nolan as lang
// dataframe always are portals.
$dataframe_sqo = json_decode(json_encode($sqo));
foreach ($dataframe_sqo->filter_by_locators as $current_filter_by_locator) {
$current_filter_by_locator->tipo = $dataframe_ddo->tipo;
$current_filter_by_locator->lang = DEDALO_DATA_NOLAN;
}

// get the data of the dataframe component
// using the sqo sent by the client
$dataframe_sections = sections::get_instance(
null, // ?array $ar_locators
$dataframe_sqo, // object $search_query_object = null
$tipo, // string $caller_tipo = null (section/portal)
$mode, // string $mode = 'list'
$lang // string $lang = DEDALO_DATA_NOLAN
);
$full_data = array_merge($full_data, $dataframe_sections->get_dato());
}
// order the full data ASC by date
usort($full_data, function($a, $b) {
return strtotime($a->timestamp) - strtotime($b->timestamp);
});

// 3 mix the both data into one
// the source_data will be the data of the main component
// dataframe_data will be the data of the dataframe
// when the source_data changes will be set with the previous dataframe_data
// when the dataframe changes it will be set with previous source_data
// dataframe_data has a array with the key of his section_id_key, it will
// used to identify the value associated to the source_data and recreate it
$source_data = null;
$dataframe_data = [null];
if (is_object($original_ddo)) {
foreach ($full_data as $current_data) {
if($current_data->tipo === $original_ddo->tipo ){
$source_data = $current_data->dato;
}
if($current_data->tipo === $original_ddo->dataframe_ddo->tipo ){
$dataframe_data[$current_data->section_id_key] = $current_data->dato;
}
$current_data->dato = $source_data;
$current_data->dataframe_data = $dataframe_data;
$current_data->tipo = $original_ddo->tipo;
$current_data->dataframe_tipo = $original_ddo->dataframe_ddo->tipo ;
}
}

// order the full data DESC by date
usort($full_data, function($a, $b) {
return strtotime($b->timestamp) - strtotime($a->timestamp);
});

// remove paginated rows as original sqo set
$offset = (int)$original_offset;
$limit = (int)$original_limit;

$sqo->limit = $original_limit;
$full_data = array_slice($full_data, $offset, $limit);

// 4 get the data of the main component with the full data
$element = sections::get_instance(
null, // ?array $ar_locators
$sqo, // object $search_query_object = null
$tipo, // string $caller_tipo = null (section/portal)
$mode, // string $mode = 'list'
$lang // string $lang = DEDALO_DATA_NOLAN
);
$element->set_dato( $full_data );
}else{
// if( $ddo_source->mode === 'tm'
// && isset($ddo_source->has_dataframe)
// && $ddo_source->has_dataframe=== true ){

// $original_limit = $sqo->limit;
// $original_offset = $sqo->offset;
// // set the limit and offset to 0 to search all data in time_machine
// $sqo->limit = 0;
// $sqo->offset = 0;
// $full_data = [];

// // 1 first get the data of the main component
// // using the sqo sent by the client
// $source_sections = sections::get_instance(
// null, // ?array $ar_locators
// $sqo, // object $search_query_object = null
// $tipo, // string $caller_tipo = null (section/portal)
// $mode, // string $mode = 'list'
// $lang // string $lang = DEDALO_DATA_NOLAN
// );
// $full_data = array_merge($full_data, $source_sections->get_dato());

// // 2 get the data of his dataframe
// $original_ddo = array_find($rqo->show->ddo_map ?? [], function($item){
// return isset($item->has_dataframe) && $item->has_dataframe===true;
// });
// if (!is_object($original_ddo)) {
// debug_log(__METHOD__
// . " Error: original_ddo (has_dataframe) not found in ddo_map! " . PHP_EOL
// . ' $rqo->show->ddo_map: ' . to_string($rqo->show->ddo_map)
// , logger::ERROR
// );
// }else if ( isset($original_ddo->dataframe_ddo) ) {
// $dataframe_ddo = $original_ddo->dataframe_ddo;
// // clone the $sqo to change without changes the original
// // the sqo will be set with the dataframe tipo and lg-nolan as lang
// // dataframe always are portals.
// $dataframe_sqo = json_decode(json_encode($sqo));
// foreach ($dataframe_sqo->filter_by_locators as $current_filter_by_locator) {
// $current_filter_by_locator->tipo = $dataframe_ddo->tipo;
// $current_filter_by_locator->lang = DEDALO_DATA_NOLAN;
// }

// // get the data of the dataframe component
// // using the sqo sent by the client
// $dataframe_sections = sections::get_instance(
// null, // ?array $ar_locators
// $dataframe_sqo, // object $search_query_object = null
// $tipo, // string $caller_tipo = null (section/portal)
// $mode, // string $mode = 'list'
// $lang // string $lang = DEDALO_DATA_NOLAN
// );
// $full_data = array_merge($full_data, $dataframe_sections->get_dato());
// }
// // order the full data ASC by date
// usort($full_data, function($a, $b) {
// return strtotime($a->timestamp) - strtotime($b->timestamp);
// });

// // 3 mix the both data into one
// // the source_data will be the data of the main component
// // dataframe_data will be the data of the dataframe
// // when the source_data changes will be set with the previous dataframe_data
// // when the dataframe changes it will be set with previous source_data
// // dataframe_data has a array with the key of his section_id_key, it will
// // used to identify the value associated to the source_data and recreate it
// $source_data = null;
// $dataframe_data = [null];
// if (is_object($original_ddo)) {
// foreach ($full_data as $current_data) {
// if($current_data->tipo === $original_ddo->tipo ){
// $source_data = $current_data->dato;
// }
// if($current_data->tipo === $original_ddo->dataframe_ddo->tipo ){
// $dataframe_data[$current_data->section_id_key] = $current_data->dato;
// }
// $current_data->dato = $source_data;
// $current_data->dataframe_data = $dataframe_data;
// $current_data->tipo = $original_ddo->tipo;
// $current_data->dataframe_tipo = $original_ddo->dataframe_ddo->tipo ;
// }
// }

// // order the full data DESC by date
// usort($full_data, function($a, $b) {
// return strtotime($b->timestamp) - strtotime($a->timestamp);
// });

// // remove paginated rows as original sqo set
// $offset = (int)$original_offset;
// $limit = (int)$original_limit;

// $sqo->limit = $original_limit;
// $full_data = array_slice($full_data, $offset, $limit);

// // 4 get the data of the main component with the full data
// $element = sections::get_instance(
// null, // ?array $ar_locators
// $sqo, // object $search_query_object = null
// $tipo, // string $caller_tipo = null (section/portal)
// $mode, // string $mode = 'list'
// $lang // string $lang = DEDALO_DATA_NOLAN
// );
// $element->set_dato( $full_data );
// }else{

// prevent edit mode set limit greater than 1
if ($model==='section' && $mode==='edit' && (!isset($sqo->limit) || (int)$sqo->limit > 1)) {
Expand All @@ -1789,7 +1789,7 @@ private static function build_json_rows(object $rqo) : object {
$mode, // string $mode = 'list'
$lang // string $lang = DEDALO_DATA_NOLAN
);
}
// }

// session sqo. Store section SQO in session.
// It's not used to main navigation, but it's needed by some tools like tool_export
Expand Down
9 changes: 9 additions & 0 deletions core/common/class.common.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2189,6 +2189,15 @@ function get_children_recursive(array $ar_ddo, object $dd_object) : array {
$caller_dataframe // object|null
);

// the the component is a dataframe and it's in time_machine call
// set data_source as tm, and the matreix_id from the main component
// it will get the correct data from the time_machine
// used to load the component in edit mode in time_machine tool.
if($model==='component_dataframe' && isset($this->matrix_id) ){
$related_element->data_source = 'tm';
$related_element->matrix_id = $this->matrix_id;
}

// Permissions inheritance.
// Get the permissions to inject to children.
// Situation :
Expand Down
Loading

0 comments on commit 8dbeb19

Please sign in to comment.