--- trunk/tntnet/dynamic/adm_installation_edit.ecpp	2007/12/02 20:26:43	126
+++ trunk/tntnet/dynamic/adm_installation_edit.ecpp	2007/12/08 16:47:03	195
@@ -45,9 +45,9 @@
 
 reply.out() << "<a href='adm_installation_list?customerid=" << customerid<< "&name=" << name << "'>";
 reply.sout() << "<< back to installation list";
-reply.out() << "</a><br>";
+reply.out() << "</a><br><br>";
 
-tntdb::Connection conn = tntdb::connect(dburl); 
+tntdb::Connection conn = tntdb::connectCached(dburl); 
 
 
 std::string submit = qparam.param("submit");
@@ -124,7 +124,72 @@
 {
 }>
 
-<form method="post" action="adm_installation_edit">
+
+<script type="text/javascript" language="JavaScript" src="/md5.js"></script>
+<script type="text/javascript" language="JavaScript" src="/trim.js"></script>
+<script type="text/javascript">
+
+function validateInstallationForm()
+{
+	var form = document.installationform;
+	form.description.value = trim(form.description.value);
+	form.phonenr.value = trim(form.phonenr.value);
+	form.imei.value = trim(form.imei.value);
+	form.updaterate.value = trim(form.updaterate.value);
+
+	if (form.description.value.length < 3)
+	{
+		alert("Description must be at least 3 characters.");
+		return false;
+	}
+
+	if (isNaN(form.phonenr.value))
+	{
+		alert("Phonenr may only contain digits");
+		return false;
+	}
+
+	if (form.phonenr.value.length < 8)
+	{
+		if (!confirm("Phonenr seems rather short, are you sure this is correct"))
+		{
+			return false;
+		}
+	}
+
+	if (isNaN(form.imei.value))
+	{
+		alert("IMEI may only contain digits");
+		return false;
+	}
+
+	if (form.imei.value.length != 15)
+	{
+		alert("IMEI must be exactly 15 digits");
+		return false;
+	}
+
+	if (isNaN(form.updaterate.value))
+	{
+		alert("Update rate may only contain digits");
+		return false;
+	}
+
+	var updaterate = parseInt(form.updaterate.value);
+
+	if (form.updaterate.value == "" || updaterate <5 || updaterate > 250)
+	{
+		alert("Update rate must be between 5 and 250\\n(Both inclusive)");
+		return false;
+	}
+	
+
+	return true;
+}
+
+</script>
+
+<form method="post" action="adm_installation_edit" name="installationform" onsubmit="return validateInstallationForm();">
 <table border="0">
 <tr>
   <td>Description:</td>
@@ -144,10 +209,10 @@
 </tr>
 <tr>
   <td>IMEI nr</td>
-  <td><input type="text" name="imei" size="40" maxlength="16" value="<$imei$>"></td>
+  <td><input type="text" name="imei" size="40" maxlength="15" value="<$imei$>"></td>
 </tr>
 <tr>
-  <td>Update rate</td>
+  <td>Update rate*</td>
   <td><input type="text" name="updaterate" size="40" value="<$updaterate$>"></td>
 </tr>
 <tr>
@@ -161,18 +226,24 @@
 <input type="hidden" name="submit" value="1">
 </form>
 
-<br>
-<form method="post" action="adm_installation_delete">
-<input type="hidden" name="id" value="<$id$>">
-<input type="hidden" name="customerid" value="<$customerid$>">
-<input type="hidden" name="name" value="<$name$>">
-<input type="submit" value="Delete">
-</form>
+<p>*: Update rate is in minutes.</p>
 
 <{
-}
-
+if (id != -1)
+{
+}>
+  <br>
+  <form method="post" action="adm_installation_delete" onsubmit="return confirm('Are you sure ?\\nThis will delete all loggings related to this installation','Delete installation');">
+  <input type="hidden" name="id" value="<$id$>">
+  <input type="hidden" name="customerid" value="<$customerid$>">
+  <input type="hidden" name="name" value="<$name$>">
+  <input type="submit" value="Delete this installation">
+  </form>
+ 
 
+<{
+} //fi (id != -1)
+} //fi (showForm)
 }>
 
 <&footer>