Commit 563112da authored by Mathieu Giraud's avatar Mathieu Giraud

Merge remote-tracking branch 'origin/rbx.vidjil.org'

parents 5c46202c ca802b21
......@@ -72,7 +72,7 @@ Database.prototype = {
var msg = " Welcome to Vidjil! </br>"
+ "Your browser currently does not recognize our SSL certificate. </br>"
+ "To use the sample database, you need to accept this certificate and/or tag this website as a trusted one. </br>"
+ "<a href='"+DB_ADDRESS+"' target='_blank'>Follow this link<a/>"
+ "<a href='"+DB_ADDRESS+"'>Follow this link<a/>"
popupMsg(msg)
}
},
......
......@@ -17,7 +17,7 @@
<body onload="init()">
<h4>Welcome to Vidjil !</h4>
The certificate is now validated.
<!-- The certificate is now validated. -->
<a id="browser" href="#">Go to Vidjil</a>
<!--
......
......@@ -4,7 +4,12 @@
<table>
<tbody>
<tr>
<td ><label for="patient_first_name" id="patient_first_name__label"> First Name: </label></td>
<td><label for="patient_id_label" id="patient_id_label__label">Patient ID: </label></td>
<td><input class="date" id="patient_id_label" name="id_label" type="text" value=""><span></span></td>
<td></td>
</tr>
<tr>
<td ><label for="patient_first_name" id="patient_first_name__label">First Name: </label></td>
<td ><input class="string" id="patient_first_name" name="first_name" type="text" value=""><span>*</span></td>
<td ></td>
</tr>
......@@ -18,11 +23,6 @@
<td><input class="date" id="patient_birth" name="birth" type="text" value=""><span>* (format: yyyy-mm-dd)</span></td>
<td></td>
</tr>
<tr>
<td><label for="patient_id_label" id="patient_id_label__label">ID label </label></td>
<td><input class="date" id="patient_id_label" name="id_label" type="text" value=""><span>id used by hospital administration system</span></td>
<td></td>
</tr>
<tr>
<td><label for="patient_info" id="patient_info__label">Info: </label></td>
<td><textarea class="text" cols="40" id="patient_info" name="info" rows="10"></textarea></td>
......
......@@ -8,6 +8,11 @@ info = db.patient[request.vars["id"]]
<input type="HIDDEN" id="patient_id" name="id" value="{{=request.vars["id"]}}">
<table>
<tbody>
<tr>
<td><label for="patient_id_label" id="patient_id_label__label">Patient ID:</label></td>
<td><input class="date" id="patient_id_label" name="id_label" type="text" value="{{=info.id_label}}"><span></span></td>
<td></td>
</tr>
<tr>
<td > <label for="patient_first_name" id="patient_first_name__label"> First Name: </label> </td>
<td > <input class="string" id="patient_first_name" name="first_name" type="text" value="{{=info.first_name}}"><span>*</span></td>
......@@ -23,11 +28,6 @@ info = db.patient[request.vars["id"]]
<td> <input class="date" id="patient_birth" name="birth" type="text" value="{{=info.birth}}"><span>* (format: yyyy-mm-dd)</span></td>
<td> </td>
</tr>
<tr>
<td><label for="patient_id_label" id="patient_id_label__label">ID label </label></td>
<td><input class="date" id="patient_id_label" name="id_label" type="text" value="{{=info.id_label}}"><span>id used by hospital administration system</span></td>
<td></td>
</tr>
<tr>
<td> <label for="patient_info" id="patient_info__label">Info: </label> </td>
<td> <textarea class="text" cols="40" id="patient_info" name="info" rows="10"> {{=info.info}} </textarea> </td>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment