From f60cfd79a4e47608cb1b8f6223a8fb15965b9649 Mon Sep 17 00:00:00 2001 From: Tim Ansell Date: Sun, 14 Jun 2009 02:20:05 +1000 Subject: [PATCH] The registery transcriber now works. --- www/docs/register/README | 6 +++ www/docs/register/images.php | 21 +++++++++++ www/docs/register/index.php | 30 ++++++++++++++++ www/docs/register/register-toForm.php | 25 ++++++++++++- www/docs/register/register-toXML.php | 3 ++ www/docs/register/register.php | 61 +++++++++++++++++++++------------ www/docs/register/top.php | 25 +++++++++++++ 7 files changed, 147 insertions(+), 24 deletions(-) create mode 100644 www/docs/register/README create mode 100644 www/docs/register/images.php create mode 100644 www/docs/register/index.php create mode 100644 www/docs/register/top.php diff --git a/www/docs/register/README b/www/docs/register/README new file mode 100644 index 0000000..32fea5c --- /dev/null +++ b/www/docs/register/README @@ -0,0 +1,6 @@ +You need a copy of interests.tar.gz put extracted to create the interests folder. +http://www.mithis.com/~tim/interests.tar.gz + +All the registery.xml files must be writable by the www server. + +No conflict detection or other fancy stuff, last person to click the save button wins. diff --git a/www/docs/register/images.php b/www/docs/register/images.php new file mode 100644 index 0000000..5fb3b1c --- /dev/null +++ b/www/docs/register/images.php @@ -0,0 +1,21 @@ + + + +" />
+ + + diff --git a/www/docs/register/index.php b/www/docs/register/index.php new file mode 100644 index 0000000..0f73414 --- /dev/null +++ b/www/docs/register/index.php @@ -0,0 +1,30 @@ + + + + + + + + diff --git a/www/docs/register/register-toForm.php b/www/docs/register/register-toForm.php index 2609421..c6c5641 100644 --- a/www/docs/register/register-toForm.php +++ b/www/docs/register/register-toForm.php @@ -1,4 +1,4 @@ -
+

House of representatives Statement of Registrable Interests

@@ -9,10 +9,15 @@ type == "new") echo "checked";?> value="new">At date of election (newly elected members)

+

Notes ...

+ + + @@ -46,5 +51,21 @@ foreach($questions as $question) { $question->toForm($this->questions); } ?> - +
Signed Date
Surname:
+ + + + + + + +
Signed: + type == "continue") echo "checked";?> value="yes">Yes
+ type == "new") echo "checked";?> value="no">No +
Signed Date
+ + + + diff --git a/www/docs/register/register-toXML.php b/www/docs/register/register-toXML.php index 836dae6..1a4c17b 100644 --- a/www/docs/register/register-toXML.php +++ b/www/docs/register/register-toXML.php @@ -1,5 +1,6 @@ + stamped_date; ?> type; ?> surname; ?> othernames; ?> @@ -11,5 +12,7 @@ foreach($questions as $question) { $question->toXML($this->questions); } ?> + signed; ?> + signed_date; ?> diff --git a/www/docs/register/register.php b/www/docs/register/register.php index dfb9f48..316ba7f 100644 --- a/www/docs/register/register.php +++ b/www/docs/register/register.php @@ -1,11 +1,14 @@ "Self", "spouse" => "Spouse", "children" => "Dependent Children"); var $name; var $description; var $fields; - + function Question($name, $description, $fields) { $this->name = $name; $this->description = $description; @@ -92,16 +95,21 @@ include "questions.php"; $states = array("NSW", "QLD", "VIC", "WA", "SA", "TAS", "NT", "ACT"); class Register { + var $stamped_date; var $type; var $surname; var $othernames; var $divison; var $state; + var $signed; + var $signed_date; static function from_post($topopulate) { global $states, $questions; $r = new Register(); + $r->stamped_date = $topopulate['stamped_date']; + if ($topopulate['type'] == "new" or $topopulate['type'] == "continue") $r->type = $topopulate['type']; @@ -116,6 +124,12 @@ class Register { $question->cleanup($topopulate['questions']); $r->questions = $topopulate['questions']; + + if ($topopulate['signed'] == "yes" or $topopulate['signed'] == "no") + $r->signed = $topopulate['signed']; + + $r->signed_date = $topopulate['signed_date']; + return $r; } @@ -123,6 +137,8 @@ class Register { global $states, $questions; $r = new Register(); + $r->stamped_date = $xml->stamped_date; + if ($xml->type == "new" or $xml->type == "continue") $r->type = (String)$xml->type; @@ -134,10 +150,13 @@ class Register { $r->state = (String)$xml->state; $r->questions = array(); - foreach($questions as $question) { + foreach($questions as $question) $question->from_xml($xml, $r->questions); - } + if ($xml->signed == "yes" or $xml->signed == "no") + $r->signed = $xml->signed; + + $r->signed_date = $xml->signed_date; return $r; } @@ -237,31 +256,29 @@ function noSubmit(event) { toXML()); + $f = fopen($who, "w"); + fwrite($f, $register->toXML()); fclose($f); - } catch (Exception $e) { - $registerobj = new Register(); - } - } else { - try { - $registerobj = Register::from_xml(simplexml_load_file($register)->register); - } catch (Exception $e) { - $registerobj = new Register(); + } else { + $xml = @simplexml_load_file($who); + if (isset($xml->register)) + $register = Register::from_xml($xml->register); + else + $register = new Register(); } + } catch (Exception $e) { + $register = new Register(); } - var_dump($registerobj); - - $registerobj->toForm(); ?> + $register->toForm(); ?> diff --git a/www/docs/register/top.php b/www/docs/register/top.php new file mode 100644 index 0000000..1bb7c87 --- /dev/null +++ b/www/docs/register/top.php @@ -0,0 +1,25 @@ + + + + +
+ + + + + + + + -- 1.5.4.3