[xoops-svn] SF.net SVN: xoops-svn:[12625] XoopsModules/TDMCreate/branches/timgno/1.91/ TDMCreate/class/files

[<txm...@us...>]

Revision: 12625
          http://sourceforge.net/p/xoops/svn/12625
Author:   txmodxoops
Date:     2014-06-21 18:15:34 +0000 (Sat, 21 Jun 2014)
Log Message:
-----------
 - Fixed bugs
 - Updated
 - Work in progress

Modified Paths:
--------------
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/pages.php
    XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language/admin.php

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/pages.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/pages.php	2014-06-21 17:27:22 UTC (rev 12624)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/admin/pages.php	2014-06-21 18:15:34 UTC (rev 12625)
@@ -80,16 +80,17 @@
 	*  @param string $table_name
 	*  @param string $language
 	*/
-	public function getAdminPagesList($module_name, $table_name, $language, $fields, $fpif, $fpmf) {  
+	public function getAdminPagesList($module_name, $table_name, $table_fieldname, $language, $fields, $fpif, $fpmf) {  
 		$stu_mod_name = strtoupper($module_name);
         $stl_mod_name = strtolower($module_name);
-		$stu_table_name = strtoupper($table_name);		
+		$stu_table_name = strtoupper($table_name);
+		$stu_table_fieldname = strtoupper($table_fieldname);
 		$ret = <<<EOT
     case 'list': 
     default:  
 		\$limit = xoops_getModuleOption('adminpager');
 		\$start = {$module_name}_CleanVars(\$_REQUEST, 'start', 0);
-		\$adminMenu->addItemButton({$language}ADD_{$stu_table_name}, '{$table_name}.php?op=new', 'add');
+		\$adminMenu->addItemButton({$language}ADD_{$stu_table_fieldname}, '{$table_name}.php?op=new', 'add');
 		echo \$adminMenu->renderButton();
 		\$criteria = new CriteriaCompo();
 		\$criteria->setSort('{$fpif} ASC, {$fpmf}');
@@ -286,6 +287,7 @@
 		$table = $this->getTable();
 		$module_name = $module->getVar('mod_name');      
 		$table_name = $table->getVar('table_name');	
+		$table_fieldname = $table->getVar('table_fieldname');	
 		$language = $this->getLanguage($module_name, 'AM');
 		$fields = $this->getTableFields($table->getVar('table_id'));
 		foreach(array_keys($fields) as $f) 
@@ -300,7 +302,7 @@
 		}		
 		$content = $this->getHeaderFilesComments($module, $filename);
 		$content .=	$this->getAdminPagesHeader($module_name, $table_name);
-		$content .=	$this->getAdminPagesList($module_name, $table_name, $language, $fields, $fpif, $fpmf);
+		$content .=	$this->getAdminPagesList($module_name, $table_name, $table_fieldname, $language, $fields, $fpif, $fpmf);
 		$content .=	$this->getAdminPagesNew($table_name, $language);		
 		$content .=	$this->getAdminPagesSave($module_name, $table_name, $language, $fields, $fpif, $fpmf);
 		$content .=	$this->getAdminPagesEdit($table_name, $language, $fpif);

Modified: XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language/admin.php
===================================================================
--- XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language/admin.php	2014-06-21 17:27:22 UTC (rev 12624)
+++ XoopsModules/TDMCreate/branches/timgno/1.91/TDMCreate/class/files/language/admin.php	2014-06-21 18:15:34 UTC (rev 12625)
@@ -61,7 +61,7 @@
 	public function getLanguageAdminIndex($language, $tables) 
 	{    
 		$ret = <<<EOT
-// ---------------- Index ----------------
+// ---------------- Admin Index ----------------
 define('{$language}STATISTICS', "Statistics");
 // There are\n
 EOT;
@@ -73,7 +73,56 @@
 			$ret .= <<<EOT
 define('{$language}THEREARE_{$stu_table_name}', "There are <span class='bold'>%s</span> {$stl_table_name} in the database");\n
 EOT;
+		}		
+		return $ret;
+	}
+	/*
+	*  @public function getLanguageAdminPages
+	*  @param string $language
+	*  @param string $tables
+	*/
+	public function getLanguageAdminPages($language, $tables) 
+	{ 		
+		$ret = <<<EOT
+// ---------------- Admin Files ----------------
+// There aren't\n
+EOT;
+		foreach (array_keys($tables) as $t)
+		{
+			$table_name = $tables[$t]->getVar('table_name');
+			
+			$stu_table_name = strtoupper($table_name);
+			$stl_table_name = strtolower($table_name);
+			$ret .= <<<EOT
+define('{$language}THEREARENT_{$stu_table_name}', "There aren't {$stl_table_name}");\n
+EOT;
 		}
+		$ret .= <<<EOT
+// Buttons\n
+EOT;
+		foreach (array_keys($tables) as $t)
+		{
+			$table_name = $tables[$t]->getVar('table_name');
+			$table_fieldname = $tables[$t]->getVar('table_fieldname');
+			$stu_table_fieldname = strtoupper($table_fieldname);
+            $ucf_table_fieldname = ucfirst($table_fieldname);			
+			$ret .= <<<EOT
+define('{$language}ADD_{$stu_table_fieldname}', "Add {$ucf_table_fieldname}");\n
+EOT;
+		}
+		$ret .= <<<EOT
+// Lists\n
+EOT;
+		foreach (array_keys($tables) as $t)
+		{
+			$table_name = $tables[$t]->getVar('table_name');
+			$table_fieldname = $tables[$t]->getVar('table_fieldname');
+			$stu_table_name = strtoupper($table_name);
+            $ucf_table_name = ucfirst($table_name);			
+			$ret .= <<<EOT
+define('{$language}{$stu_table_name}_LIST', "List of {$ucf_table_name}");\n
+EOT;
+		}
 		return $ret;
 	}
     /*
@@ -84,7 +133,7 @@
 	public function getLanguageAdminClass($language, $tables) 
 	{    
 		$ret = <<<EOT
-// ---------------- Class ----------------\n
+// ---------------- Admin Classes ----------------\n
 EOT;
 		foreach (array_keys($tables) as $t)
 		{
@@ -93,7 +142,7 @@
 			$stu_table_name = strtoupper($table_name);
             $ucf_table_name = ucfirst($table_name);			
 			$ret .= <<<EOT
-// {$ucf_table_name}
+// {$ucf_table_name} add
 define('{$language}{$stu_table_name}_ADD', "Add {$table_name}");
 define('{$language}{$stu_table_name}_EDIT', "Edit {$table_name}");
 // Elements of {$ucf_table_name}\n
@@ -124,7 +173,7 @@
 	public function getLanguageAdminPermissions($language) 
 	{    
 		$ret = <<<EOT
-// ---------------- Admin ----------------
+// ---------------- Admin Permissions ----------------
 // Permissions
 define('{$language}GLOBAL', "Permissions global");
 define('{$language}GLOBAL_DESC', "Permissions global");
@@ -164,6 +213,7 @@
 		$language = $this->getLanguage($module_name, 'AM');
 		$content = $this->getHeaderFilesComments($module, $filename);
 		$content .= $this->getLanguageAdminIndex($language, $tables);
+		$content .= $this->getLanguageAdminPages($language, $tables);
 		$content .= $this->getLanguageAdminClass($language, $tables);
 		$content .= $this->getLanguageAdminPermissions($language);
 		$content .= $this->getLanguageAdminFoot();