Changeset 15896

Timestamp:

01/18/12 23:37:32 (4 months ago)

Author:

Anton Lesnikov

Message:

Studio -> Form Builder. - > Pre Values for Sets

Location:

trunk

Files:

• modules/boonex/english/install/data/langs/en.xml (modified) (3 diffs)
• studio/classes/BxDolStudioFormsFields.php (modified) (1 diff)
• studio/classes/BxDolStudioFormsPreValues.php (modified) (1 diff)
• studio/classes/BxDolStudioFormsQuery.php (modified) (2 diffs)
• studio/templates/base/scripts/BxBaseStudioFormsField.php (modified) (8 diffs)
• studio/templates/base/scripts/BxBaseStudioFormsFields.php (modified) (1 diff)
• studio/templates/base/scripts/BxBaseStudioFormsPreValues.php (modified) (7 diffs)

trunk/modules/boonex/english/install/data/langs/en.xml

@@ -2328 +2328 @@
     <string name="_adm_form_dsc_field_value"><![CDATA[Enter default value (optional)]]></string>
     <string name="_adm_form_txt_field_values"><![CDATA[Values]]></string>
+    <string name="_adm_form_txt_field_manage_values"><![CDATA[Manage values]]></string>
     <string name="_adm_form_dsc_field_values"><![CDATA[Enter values each one in new line]]></string>
     <string name="_adm_form_txt_field_checked"><![CDATA[Checked]]></string>
@@ -2368 +2369 @@
     <string name="_adm_form_txt_field_checker_params_preg"><![CDATA[Expression]]></string>
     <string name="_adm_form_err_field_checker_params_preg"><![CDATA[Enter valid regular expression]]></string>
-    
     <string name="_adm_form_txt_pre_lists_no"><![CDATA[No]]></string>
     <string name="_adm_form_txt_pre_lists_yes"><![CDATA[Yes]]></string>
@@ -2417 +2417 @@
     <string name="_adm_form_dsc_pre_values_value"><![CDATA[You need to enter field value]]></string>
     <string name="_adm_form_err_pre_values_value"><![CDATA[Field value shouldn't be empty]]></string>
+    <string name="_adm_form_err_pre_values_value_numeric"><![CDATA[Value shouldn't be empty. Use numeric values from 0 to {0}]]></string>
     <string name="_adm_form_txt_pre_values_lkey"><![CDATA[Title]]></string>
     <string name="_adm_form_dsc_pre_values_lkey"><![CDATA[You need to enter field title]]></string>

trunk/studio/classes/BxDolStudioFormsFields.php

@@ -12 +12 @@
 bx_import('BxDolStudioTemplate');
 bx_import('BxDolStudioFormsQuery');
+
+define('BX_DOL_STUDIO_FIELD_PRE_LIST_PREFIX', '#!');
 
 class BxDolStudioFormsFields extends BxTemplStudioGrid {

trunk/studio/classes/BxDolStudioFormsPreValues.php

@@ -12 +12 @@
 bx_import('BxDolStudioTemplate');
 bx_import('BxDolStudioFormsQuery');
+
+define('BX_DOL_STUDIO_FIELD_PRE_VALUE_INT_MAX', round(log(PHP_INT_MAX, 2)));
 
 class BxDolStudioFormsPreValues extends BxTemplStudioGrid {

trunk/studio/classes/BxDolStudioFormsQuery.php

@@ -206 +206 @@
                 $sWhereClause = $this->prepare(" AND `tl`.`id`=? ", $aParams['value']);
                 break;
+            case 'by_key':
+                $aMethod['name'] = 'getRow';
+                $sWhereClause = $this->prepare(" AND `tl`.`key`=? ", $aParams['value']);
+                break;
             case 'pairs_list_values':
                 $aMethod['name'] = 'getPairs';
@@ -253 +257 @@
             case 'by_key':
                 $sWhereClause = $this->prepare(" AND `tv`.`Key`=? ", $aParams['value']);
+                break;
+            case 'by_key_order_value':
+                $sWhereClause = $this->prepare(" AND `tv`.`Key`=? ", $aParams['value']);
+                $sOrderClause = "ORDER BY `tv`.`Value` ASC";
                 break;
             case 'all':

trunk/studio/templates/base/scripts/BxBaseStudioFormsField.php

@@ -129 +129 @@
             if(isset($aForm['inputs']['values'])) {
                 $sValues = $oForm->getCleanValue('values');
-                BxDolForm::setSubmittedValue('values', serialize(explode("\n", $sValues)), $aForm['form_attrs']['method']);
+                if(is_string($sValues) && strpos($sValues, BX_DOL_STUDIO_FIELD_PRE_LIST_PREFIX) === false)
+                    BxDolForm::setSubmittedValue('values', serialize(explode("\n", $sValues)), $aForm['form_attrs']['method']);
             }
 
@@ -186 +187 @@
             }
 
-            if(isset($aForm['inputs']['values'])) {
+            if(isset($aForm['inputs']['values']['db'])) {
                 $sValues = $oForm->getCleanValue('values');
-                BxDolForm::setSubmittedValue('values', serialize(explode("\n", $sValues)), $aForm['form_attrs']['method']);
+                if(is_string($sValues) && strpos($sValues, BX_DOL_STUDIO_FIELD_PRE_LIST_PREFIX) === false)
+                    BxDolForm::setSubmittedValue('values', serialize(explode("\n", $sValues)), $aForm['form_attrs']['method']);
             }
 
@@ -253 +255 @@
         $aForm['form_attrs']['action'] = BX_DOL_URL_ROOT . 'grid.php?o=' . $sObject . '&a=' . $sAction . '&display=' . $sDisplay . '&di_id=' . (int)$this->aField['di_id'];
 
-        unset($aForm['inputs']['object'], $aForm['inputs']['module'], $aForm['inputs']['type'], $aForm['inputs']['name']);
         foreach($aForm['inputs'] as $sKey => $aInput)
             if(!in_array($sKey, array('controls')))
@@ -262 +263 @@
                         if(!empty($this->aField[$sKey]))
                             $aForm['inputs'][$sKey]['value'] = $this->getFieldValues($this->aField);
+
+                        if(in_array($aForm['inputs']['type']['value'], array('select', 'select_multiple', 'radio_set', 'checkbox_set'))) {
+                            $aForm['inputs'][$sKey]['type'] = 'value';
+                            foreach($aForm['inputs'][$sKey]['values'] as $aValue)
+                                if($aValue['key'] == $aForm['inputs'][$sKey]['value']) {
+                                    $aForm['inputs'][$sKey]['value'] = BxDolStudioTemplate::getInstance()->parseHtmlByName('bx_a.html', array(
+                                        'href' => BX_DOL_URL_STUDIO . 'builder_forms.php?page=pre_values&list=' . str_replace(BX_DOL_STUDIO_FIELD_PRE_LIST_PREFIX, '', $aValue['key']),
+                                        'title' =>  _t('_adm_form_txt_field_manage_values'),
+                                        'bx_repeat:attrs' => array(),
+                                        'content' => $aValue['value'] 
+                                    ));
+                                    break; 
+                                }
+                            unset($aForm['inputs'][$sKey]['values'], $aForm['inputs'][$sKey]['db']);
+                        }
+
                         break;
                     case 'checked':
@@ -322 +339 @@
         $aForm['inputs']['controls'][0]['value'] = _t('_adm_form_btn_field_save');
 
+        unset($aForm['inputs']['object'], $aForm['inputs']['module'], $aForm['inputs']['type'], $aForm['inputs']['name']);
         return $aForm;
     }
@@ -332 +350 @@
             case 'checkbox_set':
             case 'radio_set':
-                $mixedResult = implode("\n", unserialize($this->aField['values']));
+                //$mixedResult = implode("\n", unserialize($this->aField['values']));
+                $mixedResult = $this->aField['values'];
                 break;
             case 'input_set': 
@@ -901 +920 @@
         $aFields = array(
             'values' => array(
-                'type' => 'textarea',
+                'type' => 'select',
                 'name' => 'values',
                 'caption' => _t('_adm_form_txt_field_values'),
                 'info' => _t('_adm_form_dsc_field_values'),
                 'value' => '',
+                'values' => array(),
                 'required' => '0',
                 'db' => array (
@@ -912 +932 @@
             )
         );
+
+        $aLists = array();
+        $this->oDb->getLists(array('type' => 'all'), $aLists, false);
+        foreach($aLists as $aList)
+            $aFields['values']['values'][] = array('key' => BX_DOL_STUDIO_FIELD_PRE_LIST_PREFIX . $aList['key'], 'value' => _t($aList['title']));
+
         $this->aForm['inputs'] = $this->addInArray($this->aForm['inputs'], 'value', $aFields);
     }

trunk/studio/templates/base/scripts/BxBaseStudioFormsFields.php

@@ -10 +10 @@
 defined('BX_DOL') or die('hack attempt');
 
+bx_import('BxDolStudioFormsFields');
+
 define('BX_DOL_STUDIO_FORMS_FIELDS_JS_OBJECT', 'oBxDolStudioFormsFields');
-
-bx_import('BxDolStudioFormsFields');
 
 class BxBaseStudioFormsFields extends BxDolStudioFormsFields {

trunk/studio/templates/base/scripts/BxBaseStudioFormsPreValues.php

@@ -20 +20 @@
         $sAction = 'add';
 
+        $aList = array();
+        $this->oDb->getLists(array('type' => 'by_key', 'value' => $this->sList), $aList, false);
+        $bUseInSets = (int)$aList['use_for_sets'] == 1;
+
+        $aValueChecker = array (
+            'func' => 'avail',
+            'params' => array(),
+            'error' => _t('_adm_form_err_pre_values_value'),
+        );
+        if($bUseInSets)
+            $aValueChecker = array (
+                'func' => 'preg',
+                'params' => array('/^[0-9]{1,2}$/'),
+                'error' => _t('_adm_form_err_pre_values_value_numeric', BX_DOL_STUDIO_FIELD_PRE_VALUE_INT_MAX),
+            );
+            
         $aForm = array(
             'form_attrs' => array(
@@ -49 +65 @@
                     'caption' => _t('_adm_form_txt_pre_values_value'),
                     'info' => _t('_adm_form_dsc_pre_values_value'),
-                    'value' => '',
+                    'value' => $bUseInSets ? $this->_getAvailableSetValue($this->sList) : '',
                     'required' => '1',
                     'db' => array (
                         'pass' => 'Xss',
                     ),
-                    'checker' => array (
-                        'func' => 'avail',
-                        'params' => array(),
-                        'error' => _t('_adm_form_err_pre_values_value'),
-                    ),
+                    'checker' => $aValueChecker,
                 ),
                 'LKey' => array(
@@ -118 +130 @@
 
         if($oForm->isSubmittedAndValid()) {
+            if($bUseInSets) {
+                $iValue = (int)$oForm->getCleanValue('Value');
+                if($iValue < 0 || $iValue > BX_DOL_STUDIO_FIELD_PRE_VALUE_INT_MAX) {
+                    $iValue = $this->_getAvailableSetValue($this->sList);
+                    BxDolForm::setSubmittedValue('Value', $iValue, $aForm['form_attrs']['method']);
+                }
+            }
+
             $sTitleValue = $oForm->getCleanValue('LKey');
             $sTitleKey = '_adm_form_txt_pre_values_lkey_' . $this->getSystemName($sTitleValue);
@@ -175 +195 @@
             exit;
         }
+
+        $aList = array();
+        $this->oDb->getLists(array('type' => 'by_key', 'value' => $this->sList), $aList, false);
+        $bUseInSets = (int)$aList['use_for_sets'] == 1;
+
+        $aValueChecker = array (
+            'func' => 'avail',
+            'params' => array(),
+            'error' => _t('_adm_form_err_pre_values_value'),
+        );
+        if($bUseInSets)
+            $aValueChecker = array (
+                'func' => 'preg',
+                'params' => array('/^[0-9]{1,2}$/'),
+                'error' => _t('_adm_form_err_pre_values_value_numeric', BX_DOL_STUDIO_FIELD_PRE_VALUE_INT_MAX),
+            );
 
         $aForm = array(
@@ -210 +246 @@
                         'pass' => 'Xss',
                     ),
-                    'checker' => array (
-                        'func' => 'avail',
-                        'params' => array(),
-                        'error' => _t('_adm_form_err_pre_values_value'),
-                    ),
+                    'checker' => $aValueChecker,
                 ),
                 'LKey' => array(
@@ -274 +306 @@
 
         if($oForm->isSubmittedAndValid()) {
+            if($bUseInSets) {
+                $iValue = (int)$oForm->getCleanValue('Value');
+                if($iValue < 0 || $iValue > BX_DOL_STUDIO_FIELD_PRE_VALUE_INT_MAX) {
+                    $iValue = $this->_getAvailableSetValue($this->sList);
+                    BxDolForm::setSubmittedValue('Value', $iValue, $aForm['form_attrs']['method']);
+                }
+            }
+
             $sTitleValue = $oForm->getCleanValue('LKey');
             BxDolForm::setSubmittedValue('LKey', $aValue['lkey'], $aForm['form_attrs']['method']);
@@ -406 +446 @@
         return  $sContent . parent::_getFilterControls();
     }
+
+    protected function _getAvailableSetValue($sList) {
+        $aValues = array();
+        $this->oDb->getValues(array('type' =>'by_key_order_value', 'value' => $sList), $aValues, false);
+
+        $iValue = 0;
+        foreach($aValues as $aValue) {
+            if($iValue != (int)$aValue['value'])
+                break;
+
+            $iValue++;
+        }
+
+        return $iValue > BX_DOL_STUDIO_FIELD_PRE_VALUE_INT_MAX ? BX_DOL_STUDIO_FIELD_PRE_VALUE_INT_MAX : $iValue;
+    }
 }
 /** @} */