Merge branch 'master' of https://github.com/unaio/una

modules/boonex/events/classes/BxEventsDb.php

@@ -106,7 +106,8 @@ class BxEventsDb extends BxBaseModGroupsDb
             }
 
             // search for regular events
-            $a = $this->getAllWithKey("SELECT DISTINCT `bx_events_data`.`id`, `bx_events_data`.`event_name` AS `title`, `bx_events_data`.`event_desc` AS `description`, `bx_events_data`.`date_start`, `bx_events_data`.`date_end`, `bx_events_data`.`timezone`, `bx_events_data`.`reminder`, 0 AS `repeating`
+            $a = $this->getAllWithKey("SELECT DISTINCT `bx_events_data`.`id`, `bx_events_data`.`event_name` AS `title`, `bx_events_data`.`event_desc` AS `description`, 
+            `bx_events_data`.`threshold` AS `threshold`, `bx_events_data`.`date_start`, `bx_events_data`.`date_end`, `bx_events_data`.`timezone`, `bx_events_data`.`reminder`, 0 AS `repeating`
                 FROM `bx_events_data` $sJoin 
                 WHERE `bx_events_data`.`date_start` >= :timestamp_min AND `bx_events_data`.`date_start` <= :timestamp_max $sWhere
             ", 'id', $aBindings);
@@ -114,7 +115,7 @@ class BxEventsDb extends BxBaseModGroupsDb
             if ($a)
                 $sWhere .= " AND `bx_events_data`.`id` NOT IN(" . $this->implode_escape(array_keys($a)) . ") ";
 
-            $aRepeating = $this->getAllWithKey("SELECT DISTINCT `bx_events_data`.`id`, `bx_events_data`.`event_name` AS `title`, `bx_events_data`.`event_desc` AS `description`, `bx_events_data`.`date_start`, `bx_events_data`.`date_end`, `bx_events_data`.`timezone`, `bx_events_data`.`reminder`, 1 AS `repeating`
+            $aRepeating = $this->getAllWithKey("SELECT DISTINCT `bx_events_data`.`id`, `bx_events_data`.`event_name` AS `title`, `bx_events_data`.`event_desc` AS `description`, `bx_events_data`.`threshold` AS `threshold`, `bx_events_data`.`date_start`, `bx_events_data`.`date_end`, `bx_events_data`.`timezone`, `bx_events_data`.`reminder`, 1 AS `repeating`
                 FROM `bx_events_data`
                 LEFT JOIN `bx_events_intervals` AS `i` ON (
                     `bx_events_data`.`id` = `i`.`event_id`

modules/boonex/events/classes/BxEventsGridSessionsManage.php

@@ -139,6 +139,9 @@ class BxEventsGridSessionsManage extends BxTemplGrid
 
     protected function _getCellDate($mixedValue, $sKey, $aField, $aRow)
     {
+        if(bx_is_api()){
+            return ['type' => 'datetime', 'data'=> $mixedValue];    
+        }
         return parent::_getCellDefault(bx_time_js($mixedValue, BX_FORMAT_DATE_TIME, true), $sKey, $aField, $aRow);
     }
     

modules/boonex/events/classes/BxEventsMenuViewActionsAll.php

@@ -78,7 +78,15 @@ class BxEventsMenuViewActionsAll extends BxBaseModGroupsMenuViewActionsAll
 
     protected function _getMenuItemProfileCheckIn($aItem)
     {
-        return $this->_getMenuItemByNameActions($aItem);
+        $a = $this->_getMenuItemByNameActions($aItem);
+        if (bx_is_api()){
+
+          //  print_r($this );
+            $a['display_type'] = 'callback';
+            $a['data'] = ['request_url' => $this->_oModule->_aModule['name'] . '/check_in/&params[]=' . $this->_aMarkers['content_id'], 'on_callback' => 'hide'];
+            return $a;
+        }
+        return $a;
     }
 
     protected function _getMenuItemProfileSetBadges($aItem)

modules/boonex/events/classes/BxEventsModule.php

@@ -252,7 +252,7 @@ class BxEventsModule extends BxBaseModGroupsModule implements iBxDolCalendarServ
         $aResult = parent::decodeDataAPI($aData, $aParams);
         $aResult = array_merge($aResult, [
             'date_start' => $aData[$CNF['FIELD_DATE_START']],
-            'date_end' => $aData[$CNF['FIELD_DATE_END']]
+            'date_end' => $aData[$CNF['FIELD_DATE_END']],
         ]);
         return $aResult;
     }
@@ -304,6 +304,13 @@ class BxEventsModule extends BxBaseModGroupsModule implements iBxDolCalendarServ
         $oGrid = BxDolGrid::getObjectInstance($CNF['OBJECT_GRID_QUESTIONS_MANAGE']);
         if(!$oGrid)
             return '';
+        
+        if($this->_bIsApi){
+            return [
+                bx_api_get_block('grid', $oGrid->getCodeAPI())
+            ];
+            
+        }
 
         return $oGrid->getCode();
     }
@@ -332,6 +339,14 @@ class BxEventsModule extends BxBaseModGroupsModule implements iBxDolCalendarServ
         if(!$oGrid)
             return '';
 
+        if($this->_bIsApi){
+            return [
+                bx_api_get_block('grid', $oGrid->getCodeAPI())
+            ];
+            
+        }
+
+        
         return $oGrid->getCode();
     }
 

modules/boonex/events/classes/BxEventsSearchResult.php

@@ -43,7 +43,7 @@ class BxEventsSearchResult extends BxBaseModGroupsSearchResult
                     'table' => 'bx_events_data',
                     'mainField' => 'content_id',
                     'onField' => 'id',
-                    'joinFields' => array('id', 'event_name', 'event_desc', 'picture', 'cover', 'cover_data', 'added', 'author', 'allow_view_to', 'date_start', 'date_end'),
+                    'joinFields' => array('id', 'event_name', 'event_desc', 'picture', 'cover', 'cover_data', 'added', 'author', 'allow_view_to', 'date_start', 'date_end', 'threshold'),
                 ),
                 'account' => array(
                     'type' => 'INNER',

modules/boonex/events/classes/BxEventsTemplate.php

@@ -49,9 +49,15 @@ class BxEventsTemplate extends BxBaseModGroupsTemplate
             ];
         }
         
-        return $this->parseHtmlByName('entry-sessions.html', [
+        $s = $this->parseHtmlByName('entry-sessions.html', [
             'bx_repeat:sessions' => $aTmplVarsSession
         ]);
+        
+        if (bx_is_api()){
+            return [bx_api_get_block('event_sessions',  $aTmplVarsSession)];
+        }
+        
+        return $s;
     }
 
     function unitVars ($aData, $isCheckPrivateContent = true, $mixedTemplate = false, $aParams = array())

template/scripts/BxBaseFormView.php

@@ -1797,6 +1797,11 @@ BLAH;
             )
         );
         
+        if (bx_is_api()){
+            $aInput['type'] = 'labels';
+            $aInput['ajax_get_suggestions'] = 'system/select_labels/TemplLabelsServices&params[]=';
+        }
+        
         return $this->oTemplate->parseHtmlByName('label_select_field.html', array(
             'js_object' => $oLabel->getJsObjectName(),
             'js_code' => $oLabel->getJsCodeForm(),

template/scripts/BxBaseGrid.php

@@ -639,6 +639,9 @@ class BxBaseGrid extends BxDolGrid
             'bx-def-padding-sec-bottom bx-def-padding-sec-top', // add default classes
             isset($aField['width']) ? 'width:' . $aField['width'] : false  // add default styles
         );
+        if(bx_is_api()){
+            return ['type' => 'order', 'data'=> $mixedValue];    
+        }
         return '<td ' . $sAttr . '><div id="' . $this->_sObject . '_cell_' . $aRow[$this->_aOptions['field_id']] . '" class="bx-grid-drag-handle"><i class="sys-icon align-justify"></i></div></td>';
     }
 
@@ -737,6 +740,13 @@ class BxBaseGrid extends BxDolGrid
             elseif ($sIconUrl = $this->_oTemplate->getIconUrl($a['icon']))
                 $sImage = '<img style="background-image:url(' . $sIconUrl . ');" src="' . $this->_oTemplate->getIconUrl('spacer.gif') .'" />';
         }
+        
+        if (bx_is_api()){
+            $a['name'] = $sKey;
+            $a['type'] = 'callback';
+            return $a;
+        }
+        
         return '<button ' . $sAttr . '>' . $sIcon . $sImage . ($a['icon_only'] || empty($a['title']) ? '' : '<u>' . $a['title'] . '</u>') . '</button>';
     }
 

template/scripts/BxBaseLabelsServices.php

@@ -0,0 +1,27 @@
+<?php defined('BX_DOL') or die('hack attempt');
+/**
+ * Copyright (c) UNA, Inc - https://una.io
+ * MIT License - https://opensource.org/licenses/MIT
+ *
+ * @defgroup    UnaBaseView UNA Base Representation Classes
+ * @{
+ */
+
+/**
+ * System services related to Languages.
+ */
+class BxBaseLabelsServices extends BxDol
+{
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    public function serviceSelectLabels()
+    {
+        $oLabel = BxDolLabel::getInstance();
+        return 'todo';
+    }
+}
+
+/** @} */

template/scripts/BxBasePage.php

@@ -424,7 +424,7 @@ class BxBasePage extends BxDolPage
             'id' => $this->_aObject['id'],
             'title' => $this->_getPageTitle(),
             'uri' => $this->_aObject['uri'],
-            'url' => bx_get('params')[0] . ($query_string != '' ? '?' . $query_string : ''),
+            'url' => $this->_aObject['uri'] . (bx_get('params')[0] . ($query_string != '' ? '?' . $query_string : '')),
             'author' => $this->_aObject['author'],
             'added' => $this->_aObject['added'],
             'module' => $this->getModule(),

template/scripts/BxBaseServices.php

@@ -107,7 +107,7 @@ class BxBaseServices extends BxDol implements iBxDolProfileService
             'GetStatBlock' => 'BxBaseDashboardServices',
             
             'PerfomActionApi' => 'BxBaseServiceGrid',
-            
+            'SelectLabels' => 'BxBaseLabelsServices',
         );
     }
 

template/scripts_templ/BxTemplLabelsServices.php

@@ -0,0 +1,18 @@
+<?php defined('BX_DOL') or die('hack attempt');
+/**
+ * Copyright (c) UNA, Inc - https://una.io
+ * MIT License - https://opensource.org/licenses/MIT
+ *
+ * @defgroup    UnaTemplate UNA Template Classes
+ * @{
+ */
+
+/**
+ * @see BxBaseLabelsServices
+ */
+class BxTemplLabelsServices extends BxBaseLabelsServices
+{
+    
+}
+
+/** @} */