Revision: 6526
http://care2002.svn.sourceforge.net/care2002/?rev=6526&view=rev
Author: mizuko
Date: 2010-06-30 16:17:01 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
see #54
Modified Paths:
--------------
care2x/branches/gettext/modules/tech/tech-repair-request.php
care2x/branches/gettext/modules/tech/technik-reparatur-melden.php
Added Paths:
-----------
care2x/branches/gettext/modules/tech/tech-repair-voucher.php
Removed Paths:
-------------
care2x/branches/gettext/modules/tech/technik-reparatur-empfang.php
Modified: care2x/branches/gettext/modules/tech/tech-repair-request.php
===================================================================
--- care2x/branches/gettext/modules/tech/tech-repair-request.php
2010-06-30 16:14:35 UTC (rev 6525)
+++ care2x/branches/gettext/modules/tech/tech-repair-request.php
2010-06-30 16:17:01 UTC (rev 6526)
@@ -66,7 +66,7 @@
$db->BeginTrans();
$ok=$db->Execute($sql);
if($ok && $db->CommitTrans()) {
- header("Location:
technik-reparatur-empfang.php".URL_REDIRECT_APPEND."&repair=ask&dept=$dept&reporter=$reporter&tdate=$tdate&ttime=$ttime");
exit;
+ header("Location:
tech-repair-voucher.php".URL_REDIRECT_APPEND."&repair=ask&dept=$dept&reporter=$reporter&tdate=$tdate&ttime=$ttime");
exit;
} else {
$db->RollbackTrans();
echo "<p>".$sql."$LDDbNoSave<br>";
Copied: care2x/branches/gettext/modules/tech/tech-repair-voucher.php (from rev
6524, care2x/branches/gettext/modules/tech/technik-reparatur-empfang.php)
===================================================================
--- care2x/branches/gettext/modules/tech/tech-repair-voucher.php
(rev 0)
+++ care2x/branches/gettext/modules/tech/tech-repair-voucher.php
2010-06-30 16:17:01 UTC (rev 6526)
@@ -0,0 +1,88 @@
+<?php
+error_reporting(E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR);
+require('./roots.php');
+require($root_path.'/include/helpers/inc_environment_global.php');
+/**
+* CARE2X Integrated Hospital Information System Deployment 2.1 - 2004-10-02
+* GNU General Public License
+* Copyright 2002,2003,2004,2005 Elpidio Latorilla
+* elpi...@care2x.org,
+*
+* See the file "copy_notice.txt" for the licence notice
+*/
+define('LANG_FILE','tech.php');
+define('NO_2LEVEL_CHK',1);
+require_once($root_path.'include/helpers/inc_front_chain_lang.php');
+$breakfile='tech.php'.URL_APPEND;
+$returnfile=$_SESSION['sess_file_return'].URL_APPEND;
+$_SESSION['sess_file_return']='tech.php';
+
+if($repair=='ask'){
+ $target=$LDRequest;
+ $returnfile='tech-repair-request.php?sid='.$sid.'&lang='.$lang;
+}else{
+ $target=$LDReport;
+ $returnfile='technik-reparatur-melden.php?sid='.$sid.'&lang='.$lang;
+}
+
+# Load date formatter
+require_once($root_path.'include/helpers/inc_date_format_functions.php');
+
+# Start Smarty templating here
+ /**
+ * LOAD Smarty
+ */
+
+ # Note: it is advisable to load this after the inc_front_chain_lang.php so
+ # that the smarty script can use the user configured template theme
+
+ require_once($root_path.'gui/smarty_template/smarty_care.class.php');
+ $smarty = new smarty_care('common');
+
+# Toolbar title
+
+ $smarty->assign('sToolbarTitle',$LDTechSupport);
+
+ # href for the return button
+ $smarty->assign('pbBack',$returnfile);
+
+# href for the button
+ $smarty->assign('pbHelp',"javascript:gethelp('tech_ack.php')");
+
+ $smarty->assign('breakfile',$breakfile);
+
+ # Window bar title
+ $smarty->assign('title',$LDTechSupport);
+
+$smarty->assign('sButton','<img
'.createComIcon($root_path,'varrow.gif','0').'>');
+
+$smarty->assign('LDAck',$LDAck);
+$smarty->assign('sMascotImg','<img
'.createMascot($root_path,'mascot1_r.gif','0','bottom').' align=left>');
+$smarty->assign('LDThanksSir',$LDThanksSir);
+$smarty->assign('reporter',$reporter);
+$smarty->assign('LDYour',$LDYour);
+$smarty->assign('target',$target);
+$smarty->assign('LDReceived',$LDReceived);
+$smarty->assign('sDate',@formatDate2Local($tdate,$date_format));
+$smarty->assign('LDAt',$LDAt);
+$smarty->assign('sTime',@convertTimeToLocal($ttime));
+$smarty->assign('LDAtTech',$LDAtTech);
+
+$smarty->assign('pbOK','<FORM action="'.$returnfile.'" >
+<input type="hidden" name="sid" value="'.$sid.'">
+<input type="hidden" name="lang" value="'.$lang.'">
+<INPUT type="submit" value=" OK "></font></FORM>');
+
+$smarty->assign('sRepairLink','<a
href="tech-repair-request.php'.URL_APPEND.'">'.$LDReRepairTxt.'</a>');
+$smarty->assign('sReportLink','<a
href="technik-reparatur-melden.php'.URL_APPEND.'">'.$LDRepairReportTxt.'</a>');
+$smarty->assign('sQuestionLink','<a
href="tech-questions.php'.URL_APPEND.'">'.$LDQuestionsTxt.'</a>');
+
+$smarty->assign('sMainBlockIncludeFile','tech/acknowledge.tpl');
+
+ /**
+ * show Template
+ */
+
+ $smarty->display('common/mainframe.tpl');
+ // $smarty->display('debug.tpl');
+ ?>
\ No newline at end of file
Deleted: care2x/branches/gettext/modules/tech/technik-reparatur-empfang.php
===================================================================
--- care2x/branches/gettext/modules/tech/technik-reparatur-empfang.php
2010-06-30 16:14:35 UTC (rev 6525)
+++ care2x/branches/gettext/modules/tech/technik-reparatur-empfang.php
2010-06-30 16:17:01 UTC (rev 6526)
@@ -1,88 +0,0 @@
-<?php
-error_reporting(E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR);
-require('./roots.php');
-require($root_path.'/include/helpers/inc_environment_global.php');
-/**
-* CARE2X Integrated Hospital Information System Deployment 2.1 - 2004-10-02
-* GNU General Public License
-* Copyright 2002,2003,2004,2005 Elpidio Latorilla
-* elpi...@care2x.org,
-*
-* See the file "copy_notice.txt" for the licence notice
-*/
-define('LANG_FILE','tech.php');
-define('NO_2LEVEL_CHK',1);
-require_once($root_path.'include/helpers/inc_front_chain_lang.php');
-$breakfile='tech.php'.URL_APPEND;
-$returnfile=$_SESSION['sess_file_return'].URL_APPEND;
-$_SESSION['sess_file_return']='tech.php';
-
-if($repair=='ask'){
- $target=$LDRequest;
- $returnfile='tech-repair-request.php?sid='.$sid.'&lang='.$lang;
-}else{
- $target=$LDReport;
- $returnfile='technik-reparatur-melden.php?sid='.$sid.'&lang='.$lang;
-}
-
-# Load date formatter
-require_once($root_path.'include/helpers/inc_date_format_functions.php');
-
-# Start Smarty templating here
- /**
- * LOAD Smarty
- */
-
- # Note: it is advisable to load this after the inc_front_chain_lang.php so
- # that the smarty script can use the user configured template theme
-
- require_once($root_path.'gui/smarty_template/smarty_care.class.php');
- $smarty = new smarty_care('common');
-
-# Toolbar title
-
- $smarty->assign('sToolbarTitle',$LDTechSupport);
-
- # href for the return button
- $smarty->assign('pbBack',$returnfile);
-
-# href for the button
- $smarty->assign('pbHelp',"javascript:gethelp('tech_ack.php')");
-
- $smarty->assign('breakfile',$breakfile);
-
- # Window bar title
- $smarty->assign('title',$LDTechSupport);
-
-$smarty->assign('sButton','<img
'.createComIcon($root_path,'varrow.gif','0').'>');
-
-$smarty->assign('LDAck',$LDAck);
-$smarty->assign('sMascotImg','<img
'.createMascot($root_path,'mascot1_r.gif','0','bottom').' align=left>');
-$smarty->assign('LDThanksSir',$LDThanksSir);
-$smarty->assign('reporter',$reporter);
-$smarty->assign('LDYour',$LDYour);
-$smarty->assign('target',$target);
-$smarty->assign('LDReceived',$LDReceived);
-$smarty->assign('sDate',@formatDate2Local($tdate,$date_format));
-$smarty->assign('LDAt',$LDAt);
-$smarty->assign('sTime',@convertTimeToLocal($ttime));
-$smarty->assign('LDAtTech',$LDAtTech);
-
-$smarty->assign('pbOK','<FORM action="'.$returnfile.'" >
-<input type="hidden" name="sid" value="'.$sid.'">
-<input type="hidden" name="lang" value="'.$lang.'">
-<INPUT type="submit" value=" OK "></font></FORM>');
-
-$smarty->assign('sRepairLink','<a
href="tech-repair-request.php'.URL_APPEND.'">'.$LDReRepairTxt.'</a>');
-$smarty->assign('sReportLink','<a
href="technik-reparatur-melden.php'.URL_APPEND.'">'.$LDRepairReportTxt.'</a>');
-$smarty->assign('sQuestionLink','<a
href="tech-questions.php'.URL_APPEND.'">'.$LDQuestionsTxt.'</a>');
-
-$smarty->assign('sMainBlockIncludeFile','tech/acknowledge.tpl');
-
- /**
- * show Template
- */
-
- $smarty->display('common/mainframe.tpl');
- // $smarty->display('debug.tpl');
- ?>
\ No newline at end of file
Modified: care2x/branches/gettext/modules/tech/technik-reparatur-melden.php
===================================================================
--- care2x/branches/gettext/modules/tech/technik-reparatur-melden.php
2010-06-30 16:14:35 UTC (rev 6525)
+++ care2x/branches/gettext/modules/tech/technik-reparatur-melden.php
2010-06-30 16:17:01 UTC (rev 6526)
@@ -62,7 +62,7 @@
$db->BeginTrans();
$ok=$db->Execute($sql);
if($ok && $db->CommitTrans()) {
- header("Location:
technik-reparatur-empfang.php".URL_REDIRECT_APPEND."&dept=".$_POST['dept']."&reporter=".$_POST['reporter']."&tdate=".$_POST['tdate']."&ttime=".$_POST['ttime']);
+ header("Location:
tech-repair-voucher.php".URL_REDIRECT_APPEND."&dept=".$_POST['dept']."&reporter=".$_POST['reporter']."&tdate=".$_POST['tdate']."&ttime=".$_POST['ttime']);
exit;
} else {
$db->RollbackTrans();
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Care2002-developers mailing list
Care2002-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/care2002-developers
