Changeset 1084

Timestamp:

04/28/10 11:48:44 (22 months ago)

Author:

dordille

Message:

Added methods to retrieve data from forms.

Location:

plugins/apostropheFormBuilderPlugin/trunk/lib

Files:

• form/aFormBuilder.class.php (modified) (3 diffs)
• model/doctrine/PluginaForm.class.php (modified) (3 diffs)
• model/doctrine/PluginaFormSubmission.class.php (modified) (1 diff)
• model/doctrine/PluginaFormSubmissionTable.class.php (modified) (1 diff)

plugins/apostropheFormBuilderPlugin/trunk/lib/form/aFormBuilder.class.php

@@ -14 +14 @@
                 $this->setDefault('form_id', $this->getOption('a_form')->getId());
                 $this->setWidget('form_id' , new sfWidgetFormInputHidden());
-                
+
     $fieldsetWrapperForm = new sfForm();
     
-    foreach ($this->getOption('a_form')->aFormFieldsets as $aFormFieldset)
+    foreach ($this->getOption('a_form_fieldsets', $this->getOption('a_form')->aFormFieldsets) as $aFormFieldset)
     {
-      $fieldsetWrapperForm->embedForm($aFormFieldset->getId(), $aFormFieldset->getForm(
-        $this->getObject()->getFieldSubmissionsForFieldset($aFormFieldset['id']), 
-        array('a_form_fieldset' => $aFormFieldset)
+      $fieldsetWrapperForm->embedForm(
+        $aFormFieldset->getId(),
+        $aFormFieldset->getForm(
+          $this->getObject()->getFieldSubmissionsForFieldset($aFormFieldset['id']),
+          array('a_form_fieldset' => $aFormFieldset)
       ));
                         $fieldsetWrapperForm[$aFormFieldset->getId()]->getWidget()->setLabel($aFormFieldset->getLabel());
@@ -29 +31 @@
                 $this->useFields(array('form_id', 'fields'));
   }
-          
+        
+
   public function updateObjectEmbeddedForms($values, $forms = null)
   {
@@ -50 +53 @@
   {
     $this->getObject()->setFormId($this->getOption('a_form')->getId());
-    $this->getObject()->setIpAddress($_SERVER['REMOTE_ADDR']);  
+    $this->getObject()->setIpAddress($_SERVER['REMOTE_ADDR']);
+    $this->getObject()->setUserId($this->getOption('user_id', null));
   }
   

plugins/apostropheFormBuilderPlugin/trunk/lib/model/doctrine/PluginaForm.class.php

@@ -46 +46 @@
   }
 
-  public function getSubform($rank = 0, $aFormSubmission = null)
+  public function getSubform($rank = 0, $aFormSubmission = null, $options = array())
   {
     $i = 0;
@@ -64 +64 @@
     $form = new aFormBuilder(
       $aFormSubmission,
-      array('a_form' => $this, 'a_form_fieldsets' => $subFieldset));
+      array_merge(
+        $options,
+        array('a_form' => $this, 'a_form_fieldsets' => $subFieldset)
+    ));
     
     return $form;
@@ -82 +85 @@
   }
 
+  public function getUserSubmissions($user_id, $q = null, $hydrationMode = null)
+  {
+    return Doctrine::getTable('aFormSubmission')
+      ->getUserSubmissionsQuery($this['id'], $user_id, $q)
+      ->execute(array(), $hydrationMode);
+  }
+
 }

plugins/apostropheFormBuilderPlugin/trunk/lib/model/doctrine/PluginaFormSubmission.class.php

@@ -19 +19 @@
                 return $aFieldSubmissions;
         }
+
 }

plugins/apostropheFormBuilderPlugin/trunk/lib/model/doctrine/PluginaFormSubmissionTable.class.php

@@ -5 +5 @@
 class PluginaFormSubmissionTable extends Doctrine_Table
 {
+  public function getUserSubmissionsQuery($form_id, $user_id, $q = null)
+  {
+    if(is_null($q))
+      $q = Doctrine::getTable('aFormSubmission')->createQuery('fs');
 
+    $q->innerJoin('fs.aFormFieldSubmissions ffs INDEXBY ffs.field_id')
+      ->addWhere('fs.user_id = ?', $user_id)
+      ->addWhere('fs.form_id = ?', $form_id);
+
+    return $q;
+  }
 }