New graph screen

modules/formulize/admin/form.php

@@ -307,6 +307,7 @@
 $common['aid'] = $aid;
 $common['defaultform'] = $defaultform;
 $common['defaultlist'] = $defaultlist;
+// no default graph
 $common['form_object'] = $formObject;
 
 $permissions = array();
@@ -332,6 +333,13 @@
   $screens['listOfEntries'][$i]['title'] = $screen->getVar('title');
   $i++;
 }
+$graphsScreens = $screen_handler->getObjects(new Criteria('type','graph'),$fid);
+$i = 1;
+foreach($graphsScreens as $screen) {
+  $screens['graphs'][$i]['sid'] = $screen->getVar('sid');
+  $screens['graphs'][$i]['title'] = $screen->getVar('title');
+  $i++;
+}
 
 $settings = array();
 $settings['singleentry'] = $singleentry;

modules/formulize/admin/formindex.php

@@ -111,8 +111,8 @@ function patch40() {
 	 * 
 	 * ====================================== */
 
-	$checkThisTable = 'formulize_deletion_logs';
-	$checkThisField = 'context';
+	$checkThisTable = 'formulize_screen_graph';
+	$checkThisField = 'defaultview';
 	$checkThisProperty = false;
 	$checkPropertyForValue = false;
 
@@ -281,10 +281,33 @@ function patch40() {
 				  INDEX i_del_id (del_log_id)
 		) ENGINE=MyISAM;";
 	}
+
+	if(!in_array($xoopsDB->prefix("formulize_screen_graph"), $existingTables)) {
+			$sql[] = "CREATE TABLE `".$xoopsDB->prefix("formulize_screen_graph")."` (
+  `formid` int(11) NOT NULL auto_increment,
+  `sid` int(11) NOT NULL default 0,
+  `width` int(11) NOT NULL default 800,
+  `height` int(11) NOT NULL default 600,
+  `orientation` varchar(255) NOT NULL default 'horizontal',
+  `bgr` int(8) NOT NULL default 141,
+  `bgg` int(8) NOT NULL default 189,
+  `bgb` int(8) NOT NULL default 225,
+  `barr` int(8) NOT NULL default 143,
+  `barg` int(8) NOT NULL default 190,
+  `barb` int(8) NOT NULL default 88,
+  `ops` varchar(255) NOT NULL default 'count',
+  `labelelem` int(8) NOT NULL default 0,
+  `dataelem` int(8) NOT NULL default 0,
+  `limitviews` text NOT NULL,
+  `usecurrentviewlist` varchar(255) NOT NULL default 'Current View: ',
+  PRIMARY KEY (`formid`),
+  INDEX i_sid (`sid`)
+) ENGINE=MyISAM;";
+		}
 
 		// if this is a standalone installation, then we want to make sure the session id field in the DB is large enough to store whatever session id we might be working with
 		if(file_exists(XOOPS_ROOT_PATH."/integration_api.php")) {
-	$sql['increase_session_id_size'] = "ALTER TABLE ".$xoopsDB->prefix("session")." CHANGE `sess_id` `sess_id` varchar(60) NOT NULL";
+			$sql['increase_session_id_size'] = "ALTER TABLE ".$xoopsDB->prefix("session")." CHANGE `sess_id` `sess_id` varchar(60) NOT NULL";
 		}
 
 		$sql['add_encrypt'] = "ALTER TABLE " . $xoopsDB->prefix("formulize") . " ADD `ele_encrypt` tinyint(1) NOT NULL default '0'";
@@ -319,8 +342,10 @@ function patch40() {
 		$sql['add_elementtext'] = "ALTER TABLE " . $xoopsDB->prefix("formulize_screen_multipage") . " ADD `elementtemplate` text NOT NULL"; 
 		$sql['add_bottomtext'] = "ALTER TABLE " . $xoopsDB->prefix("formulize_screen_multipage") . " ADD `bottomtemplate` text NOT NULL"; 
 		$sql['add_formelements'] = "ALTER TABLE " . $xoopsDB->prefix("formulize_screen_form") . " ADD `formelements` text";
-        $sql['add_on_before_save'] = "ALTER TABLE " . $xoopsDB->prefix("formulize_id") . " ADD `on_before_save` text";
+		$sql['add_on_before_save'] = "ALTER TABLE " . $xoopsDB->prefix("formulize_id") . " ADD `on_before_save` text";
 		$sql['add_form_note'] = "ALTER TABLE " . $xoopsDB->prefix("formulize_id") . " ADD `note` text";
+		$sql['add_defaultview']="ALTER TABLE " . $xoopsDB->prefix("formulize_screen_graph") . " ADD `defaultview` varchar(255)";
+		//added formulize_screen_graph/defaultview jan 2015
 		foreach($sql as $key=>$thissql) {
 			if(!$result = $xoopsDB->query($thissql)) {
 				if($key === "add_encrypt") {
@@ -353,12 +378,14 @@ function patch40() {
 					print "elementtemplate already added for multipage screens.  result: OK<br>";
 				} elseif($key === "add_bottomtext") {
 					print "bottomtemplate already added for multipage screens.  result: OK<br>";
-                } elseif($key === "add_formelements") {
-                    print "formelements field already added for single page screens.  result: OK<br>";
-                } elseif($key === "add_on_before_save") {
-                    print "on_before_save field already added.  result: OK<br>";
-                } elseif($key === "add_form_note") {
-                    print "form note field already added.  result: OK<br>";
+				} elseif($key === "add_formelements") {
+					 print "formelements field already added for single page screens.  result: OK<br>";
+				} elseif($key === "add_on_before_save") {
+					    print "on_before_save field already added.  result: OK<br>";
+				} elseif($key === "add_form_note") {
+					 print "form note field already added.  result: OK<br>";
+				} elseif($key === "add_defaultview") {
+					 print "defaultview field already added.  result: OK<br>";
 				} elseif(strstr($key, 'drop_from_formulize_id_')) {
 					continue;
 				} else {

modules/formulize/admin/save/screen_graph_cases_save.php

@@ -0,0 +1,42 @@
+<?php
+// this file handles saving of graph dimension
+
+// if we aren't coming from what appears to be save.php, then return nothing
+if(!isset($processedValues)) {
+  return;
+}
+
+
+$aid = intval($_POST['aid']);
+$sid = $_POST['formulize_admin_key'];
+
+$screens = $processedValues['screens'];
+
+
+$screen_handler = xoops_getmodulehandler('graphScreen', 'formulize');
+$screen = $screen_handler->get($sid);
+
+// CHECK IF THE FORM IS LOCKED DOWN AND SCOOT IF SO
+$form_handler = xoops_getmodulehandler('forms', 'formulize');
+$formObject = $form_handler->get($screen->getVar('fid'));
+if($formObject->getVar('lockedform')) {
+  return;
+}
+// check if the user has permission to edit the form
+if(!$gperm_handler->checkRight("edit_form", $screen->getVar('fid'), $groups, $mid)) {
+  return;
+}
+
+
+$screen->setVar('ops',$screens['ops']);
+$screen->setVar('labelelem',$screens['labelelem']);
+$screen->setVar('dataelem',$screens['dataelem']);
+$screen->setVar('defaultview',$screens['defaultview']);
+$screen->setVar('usecurrentviewlist',$screens['usecurrentviewlist']);
+$screen->setVar('limitviews',$screens['limitviews']);
+
+
+if(!$screen_handler->insert($screen)) {
+  print "Error: could not save the screen properly: ".mysql_error();
+}
+?>

modules/formulize/admin/save/screen_graph_options_save.php

@@ -0,0 +1,45 @@
+<?php
+// this file handles saving of graph dimension
+
+// if we aren't coming from what appears to be save.php, then return nothing
+if(!isset($processedValues)) {
+  return;
+}
+
+
+$aid = intval($_POST['aid']);
+$sid = $_POST['formulize_admin_key'];
+
+$screens = $processedValues['screens'];
+
+
+$screen_handler = xoops_getmodulehandler('graphScreen', 'formulize');
+$screen = $screen_handler->get($sid);
+
+// CHECK IF THE FORM IS LOCKED DOWN AND SCOOT IF SO
+$form_handler = xoops_getmodulehandler('forms', 'formulize');
+$formObject = $form_handler->get($screen->getVar('fid'));
+if($formObject->getVar('lockedform')) {
+  return;
+}
+// check if the user has permission to edit the form
+if(!$gperm_handler->checkRight("edit_form", $screen->getVar('fid'), $groups, $mid)) {
+  return;
+}
+
+
+$screen->setVar('width',$screens['width']);
+$screen->setVar('height',$screens['height']);
+$screen->setVar('orientation',$screens['orientation']);
+$screen->setVar('bgr',$screens['bgr']);
+$screen->setVar('bgg',$screens['bgg']);
+$screen->setVar('bgb',$screens['bgb']);
+$screen->setVar('barr',$screens['barr']);
+$screen->setVar('barg',$screens['barg']);
+$screen->setVar('barb',$screens['barb']);
+
+
+if(!$screen_handler->insert($screen)) {
+  print "Error: could not save the screen properly: ".mysql_error();
+}
+?>

modules/formulize/admin/save/screen_settings_save.php

@@ -60,6 +60,8 @@
   $screen_handler = xoops_getmodulehandler('listOfEntriesScreen', 'formulize');
 } else if($screens['type'] == 'form') {
   $screen_handler = xoops_getmodulehandler('formScreen', 'formulize');
+} else if($screens['type'] == 'graph') {
+  $screen_handler = xoops_getmodulehandler('graphScreen', 'formulize');
 }
 
 
@@ -115,7 +117,23 @@
       $screen->setVar('reloadblank', 0);
       $screen->setVar('savebuttontext', _formulize_SAVE);
       $screen->setVar('alldonebuttontext', _formulize_DONE);
-  } 
+  } else if($screens['type'] == 'graph') {
+      // Defaults settings for graph screen. When trying to load graph screen with default settings
+      // user will be redirected to setting section
+      // Re-editted by Jinfu Jan 2015
+	  $screen->setVar('width', 500);
+	  $screen->setVar('height', 300);
+	  $screen->setVar('orientation', "horizontal");
+	  $screen->setVar('bgr', 141);
+	  $screen->setVar('bgg', 189);
+	  $screen->setVar('bgb', 225);
+	  $screen->setVar('barr', 143);
+	  $screen->setVar('barg', 190);
+	  $screen->setVar('barb', 88);
+          $screen->setVar('labelelem',0);
+          $screen->setVar('dataelem',0);
+          $screen->setVar('ops','');
+  }
 
 } else {
 

modules/formulize/admin/screen.php

@@ -62,6 +62,8 @@
         $screen_handler = xoops_getmodulehandler('formScreen', 'formulize');
     } else if($settings['type'] == 'multiPage') {
         $screen_handler = xoops_getmodulehandler('multiPageScreen', 'formulize');
+    } else if($settings['type'] == 'graph') {
+        $screen_handler = xoops_getmodulehandler('graphScreen', 'formulize');
     }
     $screen = $screen_handler->get($screen_id);
 
@@ -390,6 +392,56 @@ function multiPageScreen_addToOptionsList($form_id, $options) {
   $options['element_list'] = $element_list;
 }
 
+if($screen_id != "new" && $settings['type'] == 'graph') {
+  $graph_options = array();
+  $graph_options['width'] = $screen->getVar('width');
+  $graph_options['height'] = $screen->getVar('height');
+  $graph_options['orientation'] = $screen->getVar('orientation');
+  $graph_options['bgr'] = $screen->getVar('bgr');
+  $graph_options['bgg'] = $screen->getVar('bgg');
+  $graph_options['bgb'] = $screen->getVar('bgb');
+  $graph_options['barr'] = $screen->getVar('barr');
+  $graph_options['barg'] = $screen->getVar('barg');
+  $graph_options['barb'] = $screen->getVar('barb');
+  $graph_options['ops'] = $screen->getVar('ops');
+  list($labelelem, $selectedlabelelem) = createFieldList($screen->getVar('labelelem'), false, false, "screens-labelelem", "Choose one");
+  $graph_options['labelelem'] = $labelelem->render();
+  list($dataelem, $selecteddataelem) = createFieldList($screen->getVar('dataelem'), false, false, "screens-dataelem", "Choose one");
+  $graph_options['dataelem'] = $dataelem->render();
+  $framework_handler =& xoops_getmodulehandler('frameworks', 'formulize');
+  $form_handler =& xoops_getmodulehandler('forms', 'formulize');
+  $formObj = $form_handler->get($form_id, true); // true causes all elements to be included even if they're not visible.
+  $frameworks = $framework_handler->getFrameworksByForm($form_id);
+  $views = $formObj->getVar('views');
+  $viewPublished = $formObj->getVar('viewPublished');
+  $viewNames = $formObj->getVar('viewNames');
+  $viewFrids = $formObj->getVar('viewFrids');
+  $defaultViewOptions = array();
+  $limitViewOptions = array();
+  $defaultViewOptions['blank'] = _AM_FORMULIZE_SCREEN_LOE_BLANK_DEFAULTVIEW;
+  $defaultViewOptions['mine'] = _AM_FORMULIZE_SCREEN_LOE_DVMINE;
+  $defaultViewOptions['group'] = _AM_FORMULIZE_SCREEN_LOE_DVGROUP;
+  $defaultViewOptions['all'] = _AM_FORMULIZE_SCREEN_LOE_DVALL;
+  for($i=0;$i<count($views);$i++) {
+      if(!$viewPublished[$i]) { continue; }
+      $defaultViewOptions[$views[$i]] = $viewNames[$i];
+      if($viewFrids[$i]) {
+          $defaultViewOptions[$views[$i]] .= " (" . _AM_FORMULIZE_SCREEN_LOE_VIEW_ONLY_IN_FRAME . $frameworks[$viewFrids[$i]]->getVar('name') . ")";
+      } else {
+          $defaultViewOptions[$views[$i]] .= " (" . _AM_FORMULIZE_SCREEN_LOE_VIEW_ONLY_NO_FRAME . ")";
+      }
+  }
+  $limitViewOptions['allviews'] = _AM_FORMULIZE_SCREEN_LOE_DEFAULTVIEWLIMIT;
+  $limitViewOptions += $defaultViewOptions;
+  unset($limitViewOptions['blank']);
+  unset($defaultViewOptions['blank']);
+  $graph_options['defaultviewoptions'] = $defaultViewOptions;
+  $graph_options['defaultview'] = $screen->getVar('defaultview');
+  $graph_options['usecurrentviewlist'] = $screen->getVar('usecurrentviewlist');
+  $graph_options['limitviewoptions'] = $limitViewOptions;
+  $graph_options['limitviews'] = $screen->getVar('limitviews');
+}
+
 // common values should be assigned to all tabs
 $common['name'] = $screenName;
 $common['title'] = $screenName; // oops, we've got two copies of this data floating around...standardize sometime
@@ -456,6 +508,16 @@ function multiPageScreen_addToOptionsList($form_id, $options) {
   $adminPage['tabs'][6]['content'] = $templates + $common;
 }
 
+if($screen_id != "new" && $settings['type'] == 'graph') {
+  $adminPage['tabs'][2]['name'] = _AM_GRAPH_SCREEN_OPTIONS;
+  $adminPage['tabs'][2]['template'] = "db:admin/screen_graph_options.html";
+  $adminPage['tabs'][2]['content'] = $graph_options + $common;
+
+  $adminPage['tabs'][3]['name'] = _AM_GRAPH_SCREEN_CASES;
+  $adminPage['tabs'][3]['template'] = "db:admin/screen_graph_cases.html";
+  $adminPage['tabs'][3]['content'] = $graph_options + $common;
+}
+
 $adminPage['pagetitle'] = _AM_FORM_SCREEN.$screenName;
 $adminPage['needsave'] = true;
 $adminPage['show_user_view'] = array("View Screen", XOOPS_URL."/modules/formulize/index.php?sid=$screen_id");

modules/formulize/class/applications.php

@@ -395,7 +395,7 @@ function insertMenuLink($appid,$menuitem){
         $rankquery = "SELECT MAX(rank) FROM `".$xoopsDB->prefix("formulize_menu_links")."` WHERE appid=".$appid.";";
         if($result = $xoopsDB->query($rankquery)) {
         	//if empty query, then rank = 1, else, rank is the next larger number
-        	$max = $xoopsDB->fetchAssoc($result);
+        	$max = $xoopsDB->fetchArray($result);
             $rank= $max['MAX(rank)']+1;
         }