Bug Fixes & More

Vodhin · Oct 4, 2024 · 587ec43 · 587ec43
1 parent 14ef72a
commit 587ec43
Show file tree

Hide file tree

Showing 6 changed files with 230 additions and 180 deletions.
diff --git a/ui/core.php b/ui/core.php
@@ -3235,6 +3235,7 @@ public function estCommunitySpacesForm($subd_idx,$subd_city){
     $dta = estGetSubDivDta($subd_idx,$subd_city);
 
     $txt = '
+    <div>'.$tp->toHTML($dta['subd_description'],true).'</div>
     <div id="estSubDivCont" class="WD100"  data-id="'.intval($dta['subd_idx']).'" data-city="'.intval($subd_city).'" data-hoareq="'.intval($dta['subd_hoareq']).'" data-hoafee="'.intval($dta['subd_hoafee']).'" data-hoafrq="'.intval($dta['subd_hoafrq']).'" data-hoaappr="'.intval($dta['subd_hoaappr']).'">
       <table id="estate-commspaces-tabl" class="table-striped estateSubTable estDragTable">
         <colgroup></colgroup>
@@ -3626,13 +3627,16 @@ public function estOAFormTR($TYPE,$FLD,$DTA,$options=null,$OPTARR=array()){
         <tr>
           <td colspan="2" class="noPAD">
             <h4 class="WD100">
-              <span id="estCommSpaceName"></span> '.EST_GEN_SPACES.'
+              <span class="estCommSpaceName"></span> '.EST_GEN_SPACES.'
             </h4>
             <div id="estCommSpaceGrpDiv" class="estSpaceGrpTileCont"></div>
+            <div id="estCommDesc"></div>
+            <hr />
             <h4 class="WD100">
-              <span id="estCitySpaceName"></span> '.EST_GEN_SPACES.'
+              <span class="estCitySpaceName"></span> '.EST_GEN_SPACES.'
             </h4>
             <div id="estCitySpaceGrpDiv" class="estSpaceGrpTileCont"></div>
+            <div id="estCityDesc" class="estSpaceGrpTileCont">'.$DTA['city_description'].'</div>
           </td>
         </tr>';
         break;

diff --git a/ui/listing.php b/ui/listing.php
@@ -1149,6 +1149,26 @@ class estate_listing_ui extends e_admin_ui{
         'help' => EST_PREF_DEFCURRENCYHLP,
         'readParms' => array (), 
         'writeParms' => array('size'=>'small','optArray'=>EST_CURSYMB),
+        ),
+			'dimu1' => array (
+        'tab'=>0,
+        'title' => LAN_DEFAULT.' '.EST_PREF_DIMU1,
+        'type' => 'dropdown',
+        'data' => 'str',
+        'width' => 'auto',
+        'help' => EST_PREF_DIMU1HLP,
+        'readParms' => array (), 
+        'writeParms' => array('size'=>'large','optArray'=>array(EST_PREF_DIMU1A,EST_PREF_DIMU1B)),
+        ),
+			'dimu2' => array (
+        'tab'=>0,
+        'title' => LAN_DEFAULT.' '.EST_PREF_DIMU2,
+        'type' => 'dropdown',
+        'data' => 'str',
+        'width' => 'auto',
+        'help' => EST_PREF_DIMU2HLP,
+        'readParms' => array (), 
+        'writeParms' => array('size'=>'small','optArray'=>array(EST_GEN_ACRES,EST_GEN_SQRMI,EST_SQFOOTX,EST_GEN_SQRKM,EST_SQMTRX)),
         ),
 
 			'addnewuser' => array (
@@ -1388,6 +1408,15 @@ class estate_listing_ui extends e_admin_ui{
         'width' => 'auto',
         'writeParms' => array('size'=>'xlarge','optArray'=>array(0=>EST_PREF_MAPAGENCY_NO,1=>EST_PREF_MAPAGENCY_YES)),
         ),
+      'map_include_sold'=>array(
+        'tab'=>5,
+        'title'=>EST_PREF_MAPINCLPROP,
+        'help'=>EST_PREF_MAPINCLPROPHLP,
+        'type'=>'dropdown',
+        'data'=>'str',
+        'width' => 'auto',
+        'writeParms' => array('size'=>'xlarge','optArray'=>array(0=>EST_PREF_MAPINCLPROPOPT0,1=>EST_PREF_MAPINCLPROPOPT1,2=>EST_PREF_MAPINCLPROPOPT2)),
+        ),
 
       'map_jssrc'=>array( 
         'tab'=>5,
@@ -1576,6 +1605,7 @@ public function init() {
 			$this->fields['prop_country']['writeParms']['optArray'] = $frm->getCountry();
 			$this->fields['prop_country']['writeParms']['default'] = 'blank';
 
+
 			$this->prefs['country']['writeParms']['optArray'] = $frm->getCountry();
 
       $data2 = array();
@@ -2072,7 +2102,10 @@ public function prop_appr($curVal,$mode){
         if(intval($dta['prop_agent']) > 0){return EST_GEN_NOT.' '.EST_GEN_REQUIRED.'<input type="hidden" name="prop_appr" value="1" />';}
         else if(EST_USERPERM >= intval($EST_PREF['public_mod'])){
           return '<select name="prop_appr" value="'.intval($curVal).'">
-          <option value=""'.(intval($curVal) == 0 ? ' selected="selected"' : '').'>'.EST_GEN_NOT.' '.EST_GEN_APPROVED.'</option><option value=""'.(intval($curVal) == 1 ? ' selected="selected"' : '').'>'.EST_GEN_APPROVED.'</option></select>';
+          <option value=""'.(intval($curVal) == 0 ? ' selected="selected"' : '').'>'.EST_GEN_NOT.' '.EST_GEN_APPROVED.'</option><option value=""'.(intval($curVal) == 1 ? ' selected="selected"' : '').'>'.EST_GEN_APPROVED.'</option></select>
+          <input type="hidden" name="estDefCur" value="'.$EST_PREF['currency'].'" />
+          <input type="hidden" name="estDefDIMU1" value="'.$EST_PREF['dimu1'].'" />
+          <input type="hidden" name="estDefDIMU2" value="'.$EST_PREF['dimu2'].'" />';
           }
         else{
           if(EST_USERPERM > 0 || check_class($EST_PREF['public_apr'])){$curVal = 1;}      
@@ -2509,17 +2542,19 @@ public function prop_complxuc($curVal,$mode){
   public function prop_comminuty($curVal,$mode){
     switch($mode){
 			case 'write':
+
         return '
-        <h4 class="WD100">
-          <span id="estCommSpaceName"></span> '.EST_GEN_SPACES.'
-        </h4>
-        <div id="estCommSpaceGrpDiv" class="estSpaceGrpTileCont"></div>
-        <div id="estCommDesc"></div>
-        <hr />
-        <h4 class="WD100">
-          <span id="estCitySpaceName"></span> '.EST_GEN_SPACES.'
-        </h4>
-        <div id="estCitySpaceGrpDiv" class="estSpaceGrpTileCont"></div>';
+          <h4 class="WD100">
+            <span class="estCommSpaceName"></span> '.EST_GEN_SPACES.'
+          </h4>
+          <div id="estCommSpaceGrpDiv" class="estSpaceGrpTileCont"></div>
+          <div id="estCommDesc"></div>
+          <hr />
+          <h4 class="WD100">
+            <span class="estCitySpaceName"></span> '.EST_GEN_SPACES.'
+          </h4>
+          <div id="estCitySpaceGrpDiv" class="estSpaceGrpTileCont"></div>
+          <div id="estCityDesc"></div>';
         break;
 			case 'read': 
 			case 'filter':

diff --git a/ui/msg.php b/ui/msg.php
@@ -668,7 +668,7 @@ function est_msg_form($DTA=null){
         </tr>
         <tr>
           <td>
-            <select name="msg_mode" class="tbox form-control" value="'.$msg_mode.'">';
+            <select name="msg_mode" class="tbox form-control" value="-1">';
     foreach($EST_MSG_MODES as $k=>$v){
 
       $ret .= '<option value="'.$k.'">'.$tp->toHTML($v).'</option>'; //'.($k == $msg_mode ? 'selected="selected"' : '').'

diff --git a/ui/oa.php b/ui/oa.php
@@ -505,6 +505,9 @@
 $OATXT .= $frm->tabs($TBS, $TBSOPTS);
 
 $OATXT .= '<input type="hidden" name="estPTrig" value="'.USERID.'" />
+<input type="hidden" name="estDefCur" value="'.$EST_PREF['currency'].'" />
+<input type="hidden" name="estDefDIMU1" value="'.$EST_PREF['dimu1'].'" />
+<input type="hidden" name="estDefDIMU2" value="'.$EST_PREF['dimu2'].'" />
 </form>
 <div id="estJSpth" data-pth="'.EST_PATHABS.'"></div>
 <div id="estMobTst"></div>