Guest User

Untitled

a guest
Jan 13th, 2019
105
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 7.20 KB | None | 0 0
  1. diff --git a/application/admin/index/controllers/SessionsController.php b/application/admin/index/controllers/SessionsController.php
  2. index 135110c..ad72250 100644
  3. --- a/application/admin/index/controllers/SessionsController.php
  4. +++ b/application/admin/index/controllers/SessionsController.php
  5. @@ -77,6 +77,7 @@ class SessionsController extends IP_Controller_EventAction {
  6.                 $obj->groupIDs      = $form->getElement('groupIDs')->getValue();
  7.                 $obj->title         = $form->getElement('title')->getValue();
  8.                 $obj->number        = $form->getElement('number')->getValue();
  9. +               $obj->points        = $form->getElement('points')->getValue();
  10.                 $obj->maxAttendance = $form->getElement('maxAttendance')->getValue();
  11.                 $obj->typeID        = ($form->getElement('typeID')->getValue()  != '')        ? $form->getElement('typeID')->getValue()        : null;
  12.                 $obj->programID     = ($form->getElement('programID')->getValue() != '')      ? $form->getElement('programID')->getValue()     : null;
  13. @@ -518,6 +519,9 @@ class SessionsController extends IP_Controller_EventAction {
  14.                             $obj->title         = $form->getElement('title')->getValue();
  15.                         if(!$notFullAccess || $obj->canWrite('number'))
  16.                             $obj->number            = $form->getElement('number')->getValue();
  17. +                       if(!$notFullAccess || $obj->canWrite('points')) {
  18. +                           $obj->points            = $form->getElement('points')->getValue();
  19. +                       }  
  20.                         if(!$notFullAccess || $obj->canWrite('maxAttendance')) {
  21.                             $obj->maxAttendance = $form->getElement('maxAttendance')->getValue();
  22.                         }
  23. @@ -673,6 +677,9 @@ class SessionsController extends IP_Controller_EventAction {
  24.             $form->getElement('title')->setValue($obj->title);
  25.             if($form->getElement('number'))
  26.             $form->getElement('number')->setValue($obj->number);
  27. +           if($form->getElement('points')) {
  28. +               $form->getElement('points')->setValue($obj->points);
  29. +           }
  30.             if($form->getElement('maxAttendance')) {
  31.                 $form->getElement('maxAttendance')->setValue($obj->maxAttendance);
  32.             }
  33. @@ -1778,6 +1785,13 @@ class SessionsController extends IP_Controller_EventAction {
  34.         if($mode == 'readonly')
  35.             $e->setAttrib('disabled','disabled');
  36.         $f->addElement($e);
  37. +      
  38. +       $e = $f->createElement('text', 'points');
  39. +       $e->setLabel(IP::_('Sessions::LABEL_POINTS'));
  40. +       if($mode == 'readonly') {
  41. +           $e->setAttrib('disabled','disabled');
  42. +       }
  43. +       $f->addElement($e);
  44.  
  45.         $e = $f->createElement('text', 'number');
  46.         $e->setLabel(IP::_('Sessions::LABEL_NUMBER'));
  47. diff --git a/application/admin/index/scripts/sessions/add.phtml b/application/admin/index/scripts/sessions/add.phtml
  48. index 32def06..8c83acc 100644
  49. --- a/application/admin/index/scripts/sessions/add.phtml
  50. +++ b/application/admin/index/scripts/sessions/add.phtml
  51. @@ -31,6 +31,7 @@ $this->ip()->startContainer();
  52.              $this->ip()->endElement();
  53.             echo $this->form->getElement('maxAttendance');
  54.             echo $this->form->getElement('typeID');
  55. +           echo $this->form->getElement('points');
  56.             echo $this->form->getElement('exhibitorID');
  57.             echo $this->form->getElement('publish');
  58.            
  59. @@ -52,6 +53,11 @@ $this->ip()->startContainer();
  60.             echo $this->form->getElement('mentorUserID');
  61.             echo $this->form->getElement('groupIDs');
  62.            
  63. +           foreach (IP::getInstance()->getEvent()->getTableObject('SessionTypes')->fetchAll() as $type)
  64. +            {
  65. +                echo $this->form->getElement('sessionType_'.$type->recordID);
  66. +            }
  67. +          
  68.         $this->ip()->endGroup();
  69.     $this->ip()->endRightContainer();
  70.  
  71. @@ -216,12 +222,25 @@ function checkSponsorSelect(selectValue) {
  72.         jQuery('#exhibitorID').attr("disabled", true);
  73.     }
  74.  }
  75. +function togglePointsField(selectValue) {
  76. +    var systemType = jQuery("#sessionType_"+selectValue).val();
  77. +   if(systemType != "1"){
  78. +       jQuery("#points").hide();
  79. +       jQuery('[for=points]').hide();
  80. +       jQuery("#points").val(0);
  81. +   } else {
  82. +       jQuery("#points").show();
  83. +       jQuery('[for=points]').show();
  84. +   }
  85. +}
  86.  function onSessionTypeSelectChange(target) {
  87.     checkSponsorSelect(target.value);
  88. +   togglePointsField(target.value);
  89.  }
  90.  
  91.  jQuery(document).ready(function() {
  92.     checkSponsorSelect(jQuery('#typeID').val());
  93. +   togglePointsField(jQuery('#typeID').val());
  94.     jQuery('#date').bind('change', checkDate);
  95.     jQuery('#startTime').bind('change', checkRooms);
  96.     jQuery('#duration').bind('change', checkRooms);
  97. diff --git a/application/admin/index/scripts/sessions/edit.phtml b/application/admin/index/scripts/sessions/edit.phtml
  98. index 0121b2e..43acbfb 100644
  99. --- a/application/admin/index/scripts/sessions/edit.phtml
  100. +++ b/application/admin/index/scripts/sessions/edit.phtml
  101. @@ -55,6 +55,7 @@ $this->ip()->startContainer();
  102.              $this->ip()->endElement();
  103.             echo $this->form->getElement('maxAttendance');
  104.             echo $this->form->getElement('typeID');
  105. +           echo $this->form->getElement('points');
  106.             echo $this->form->getElement('exhibitorID');
  107.             echo $this->form->getElement('status');
  108.             echo $this->form->getElement('publish');
  109. @@ -611,6 +612,18 @@ function checkSponsorSelect(selectValue) {
  110.     }
  111.  }
  112.  
  113. +function togglePointsField(selectValue) {
  114. +    var systemType = jQuery("#sessionType_"+selectValue).val();
  115. +   if(systemType != "1"){
  116. +       jQuery("#points").hide();
  117. +       jQuery('[for=points]').hide();
  118. +       jQuery("#points").val(0);
  119. +   } else {
  120. +       jQuery("#points").show();
  121. +       jQuery('[for=points]').show();
  122. +   }
  123. +}
  124. +
  125.  function onSessionTypeSelectChange(target){
  126.     var recordID = jQuery("#typeID option:selected").val();
  127.      var systemType = jQuery("#sessionType_"+recordID).val();
  128. @@ -621,10 +634,12 @@ function onSessionTypeSelectChange(target){
  129.     }
  130.  
  131.     checkSponsorSelect(target.value);
  132. +   togglePointsField(target.value);
  133.  }
  134.  
  135.  jQuery(document).ready(function() {
  136.     checkSponsorSelect(jQuery('#typeID').val());
  137. +   togglePointsField(jQuery('#typeID').val());
  138.     jQuery('#date').bind('change', checkDate);
  139.     jQuery('#startTime').bind('change', checkRooms);
  140.     jQuery('#duration').bind('change', checkRooms);
  141. diff --git a/classes/IP/Db/Table/Abstract.php b/classes/IP/Db/Table/Abstract.php
  142. index 0f9bd54..a56b231 100644
  143. --- a/classes/IP/Db/Table/Abstract.php
  144. +++ b/classes/IP/Db/Table/Abstract.php
  145. @@ -13,6 +13,7 @@ abstract class IP_Db_Table_Abstract extends Zend_Db_Table_Abstract implements IP
  146.     const DATETIME = 'datetime';
  147.     const ENUM = 'enum';
  148.     const DECIMAL = 'decimal';
  149. +   const SMALLINT = 'smallint';
  150.  
  151.     const PARENT_CLASS_COLUMN = 'parentClassColumn';
  152.     const DEPENDENT_SORT = 'dependentSort';
  153. diff --git a/model/Sessions.php b/model/Sessions.php
  154. index a65457f..f83afde 100644
  155. --- a/model/Sessions.php
  156. +++ b/model/Sessions.php
  157. @@ -21,6 +21,7 @@ class Sessions extends IP_Db_Table_EventAbstractCalendarObject implements IP_Map
  158.     const LABEL_SCHEDULED       = 'Scheduled';
  159.     const LABEL_STATUS          = 'Status';
  160.     const LABEL_TITLE           = 'Title';
  161. +   const LABEL_POINTS          = 'Points';
  162.     const LABEL_NUMBER          = 'Number';
  163.     const LABEL_TYPEID          = 'Type';
  164.     const LABEL_PROGRAMID       = 'Program';
  165. @@ -203,6 +204,7 @@ class Sessions extends IP_Db_Table_EventAbstractCalendarObject implements IP_Map
  166.         $this->addColumn('modifiedDate',self::DATETIME);
  167.         $this->addColumn('objectCreated', self::DATE);
  168.         $this->addColumn('objectModified', self::DATE);
  169. +       $this->addColumn('points', self::SMALLINT);
  170.         return true;
  171.     }
Add Comment
Please, Sign In to add comment