Merge pull request egbot#70 from BioKIC/master

Occurrence Editor bug fix
BioKIC · Apr 4, 2021 · 56741d5 · 56741d5
2 parents 525a47b + 422b461
commit 56741d5
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 10 deletions.
diff --git a/classes/OccurrenceIndividual.php b/classes/OccurrenceIndividual.php
@@ -367,7 +367,7 @@ public function getDuplicateArr(){
 	public function getTraitArr(){
 		$retArr = array();
 		if($this->occid){
-			$sql = 'SELECT t.traitid, t.traitName, t.description AS t_desc, t.refUrl AS t_url, s.stateid, s.stateName, s.description AS s_desc, s.refUrl AS s_url, d.parentstateid '.
+			$sql = 'SELECT t.traitid, t.traitName, t.traitType, t.description AS t_desc, t.refUrl AS t_url, s.stateid, s.stateName, s.description AS s_desc, s.refUrl AS s_url, d.parentstateid '.
 				'FROM tmattributes a INNER JOIN tmstates s ON a.stateid = s.stateid '.
 				'INNER JOIN tmtraits t ON s.traitid = t.traitid '.
 				'LEFT JOIN tmtraitdependencies d ON t.traitid = d.traitid '.
@@ -378,6 +378,7 @@ public function getTraitArr(){
 					$retArr[$r->traitid]['name'] = $r->traitName;
 					$retArr[$r->traitid]['desc'] = $r->t_desc;
 					$retArr[$r->traitid]['url'] = $r->t_url;
+					$retArr[$r->traitid]['type'] = $r->traitType;
 					$retArr[$r->traitid]['depStateID'] = $r->parentstateid;
 					$retArr[$r->traitid]['state'][$r->stateid]['name'] = $r->stateName;
 					$retArr[$r->traitid]['state'][$r->stateid]['desc'] = $r->s_desc;
@@ -402,21 +403,28 @@ public function getTraitArr(){
 	}
 
 	public function echoTraitDiv($traitArr, $targetID, $ident = 15){
-		$tArr = $traitArr[$targetID];
-		foreach($tArr['state'] as $stateID => $sArr){
-			$this->echoTraitUnit($sArr,$ident);
-			if(array_key_exists('depTraitID',$sArr)){
-				foreach($sArr['depTraitID'] as $depTraitID){
-					$this->echoTraitDiv($traitArr, $depTraitID, $ident+15);
+		if(array_key_exists($targetID,$traitArr)){
+			$tArr = $traitArr[$targetID];
+			foreach($tArr['state'] as $stateID => $sArr){
+				$label = '';
+				if($tArr['type'] == 'TF') $label = $traitArr[$targetID]['name'];
+				$this->echoTraitUnit($sArr, $label, $ident);
+				if(array_key_exists('depTraitID',$sArr)){
+					foreach($sArr['depTraitID'] as $depTraitID){
+						$this->echoTraitDiv($traitArr, $depTraitID, $ident+15);
+					}
 				}
 			}
 		}
 	}
 
-	public function echoTraitUnit($outArr, $indent=0){
+	public function echoTraitUnit($outArr, $label = '', $indent=0){
 		echo '<div style="margin-left:'.$indent.'px">';
 		if($outArr['url']) echo '<a href="'.$outArr['url'].'" target="_blank">';
-		echo '<b>'.$outArr['name'].'</b> ';
+		echo '<span class="traitName">';
+		if($label) echo $label.' ';
+		echo $outArr['name'];
+		echo '</span>';
 		if($outArr['url']) echo '</a>';
 		if($outArr['desc']) echo ': '.$outArr['desc'];
 		echo '</div>';

diff --git a/collections/editor/occurrenceeditor.php b/collections/editor/occurrenceeditor.php
@@ -185,7 +185,7 @@
 		}
 		//Only full editors can perform following actions
 		if($isEditor == 1 || $isEditor == 2){
-			if($action == 'Add Record'){
+			if($action == 'addOccurRecord'){
 				if($occManager->addOccurrence($_POST)){
 					$occManager->setQueryVariables();
 					$qryCnt = $occManager->getQueryRecordCount();

diff --git a/collections/individual/index.php b/collections/individual/index.php
@@ -252,6 +252,7 @@ function initializeMap(){
 		.imgDiv{ max-width:200; float:left; text-align:center; padding:5px }
 		.occur-ref{ margin: 10px 0px }
 		.traitDiv{ margin:20px; }
+		.traitName{ font-weight:bold; }
 	</style>
 </head>
 <body>

diff --git a/js/symb/collections.labeljsongui.js b/js/symb/collections.labeljsongui.js
@@ -420,6 +420,42 @@ const dropdownsArr = [
       { value: 'mb-12', text: '12' },
     ],
   },
+  {
+    id: 'ml',
+    name: 'spacing-left',
+    group: 'field-block',
+    options: [
+      { value: '', text: 'Line Spacing Left' },
+      { value: 'ml-0', text: '0' },
+      { value: 'ml-1', text: '1' },
+      { value: 'ml-2', text: '2' },
+      { value: 'ml-3', text: '3' },
+      { value: 'ml-4', text: '4' },
+      { value: 'ml-5', text: '5' },
+      { value: 'ml-6', text: '6' },
+      { value: 'ml-8', text: '8' },
+      { value: 'ml-10', text: '10' },
+      { value: 'ml-12', text: '12' },
+    ],
+  },
+  // {
+  //   id: 'mr',
+  //   name: 'spacing-right',
+  //   group: 'field-block',
+  //   options: [
+  //     { value: '', text: 'Line Spacing Right' },
+  //     { value: 'mr-0', text: '0' },
+  //     { value: 'mr-1', text: '1' },
+  //     { value: 'mr-2', text: '2' },
+  //     { value: 'mr-3', text: '3' },
+  //     { value: 'mr-4', text: '4' },
+  //     { value: 'mr-5', text: '5' },
+  //     { value: 'mr-6', text: '6' },
+  //     { value: 'mr-8', text: '8' },
+  //     { value: 'mr-10', text: '10' },
+  //     { value: 'mr-12', text: '12' },
+  //   ],
+  // },
 ];
 const dummy = document.getElementById('dummy');
 const fieldDiv = document.getElementById('fields');