X-Git-Url: http://git.uio.no/git/?p=u%2Ferikhf%2Ffrm.git;a=blobdiff_plain;f=src%2Fcomponents%2Fsidebar%2Fsidebar.html;h=f019dd86e963d64a926d29d0c7b10d434e96640e;hp=f5fd079e32eac42a063f166690322d874a76fbf2;hb=f03b789075148a33d4d1b83214807e5db32d99b5;hpb=57c243b60e8f824fc4358f0d1870c2239c50b0d6

diff --git a/src/components/sidebar/sidebar.html b/src/components/sidebar/sidebar.html
index f5fd079..f019dd8 100644
--- a/src/components/sidebar/sidebar.html
+++ b/src/components/sidebar/sidebar.html
@@ -1,92 +1,142 @@
 <div>
-    <div *ng-if="activeOrgUnit">
-        <form *ng-if="editmode" (ng-submit)="onSubmit()" #of="form">
-            <h3>{{activeOrgUnit.id?"Update Organizational Unit":"Add new Organizational Unit"}}</h3>
+    <div [hidden]="!active" class="form-background" style="overflow-y:auto; position:relative; float:right; ">
+        <form *ng-if="editmode" [(ng-form-model)]="form" (ng-submit)="onSubmit()" #of="form">
+            <h2>{{newObject?"Add new Organizational Unit":"Update Organizational Unit"}}</h2>
+
             <div class="form-group">
                 <label>Name</label>
-                <input class="form-control" type="text" [(ng-model)]="activeOrgUnit.name" required ng-control="name" #name="form">
-                <p [hidden]="name.valid" class="alert alert-danger">
+                <input class="form-control" type="text" ng-control="name">
+                <p [hidden]="name.valid || name.untouched" class="alert alert-danger">
                     Name is required
                 </p>
 
             </div>
             <div class="form-group">
                 <label>Short Name</label>
-                <input class="form-control" type="text" [(ng-model)]="activeOrgUnit.shortName" required ng-control="shortname" #shortname="form">
-                <p [hidden]="shortname.valid" class="alert alert-danger">
+                <input class="form-control" type="text" ng-control="shortName" #shortname="form">
+
+                <p [hidden]="shortname.valid || shortname.untouched" class="alert alert-danger">
                     Short name is required
                 </p>
             </div>
 
             <div class="form-group">
                 <label>Description</label>
-                <textarea class="form-control" [(ng-model)]="activeOrgUnit.description" rows="3"></textarea>
+                <textarea class="form-control" ng-control="description" rows="3"></textarea>
             </div>
             <div class="form-group">
                 <label>Code</label>
-                <input class="form-control" type="text" [(ng-model)]="activeOrgUnit.code">
+                <input class="form-control" type="text" ng-control="code">
             </div>
+
             <div class="form-group">
                 <label>Opening Date</label>
-                <input class="form-control" type="date" [(ng-model)]="activeOrgUnit.openingDate" required ng-control="openingdate" #openingDate="form">
-                <p [hidden]="openingdate.valid" class="alert alert-danger">Opening date is required</p>
+                <input class="form-control" type="date" ng-control="openingDate" #openingDate="form">
+
+                <p [hidden]="openingdate.valid || openingdate.untouched" class="alert alert-danger">Opening date is required</p>
             </div>
             <div class="form-group">
                 <label>Closed Date</label>
-                <input class="form-control" type="date" [(ng-model)]="activeOrgUnit.closedDate">
+                <input class="form-control" type="date" ng-control="closedDate">
             </div>
             <div class="form-group">
                 <label>URL</label>
-                <input class="form-control" type="url" [(ng-model)]="activeOrgUnit.url" ng-control="url" #url="form">
+                <input class="form-control" type="url" ng-control="url" #url="form">
+
                 <p [hidden]="url.valid" class="alert alert-danger">The specified URL is not valid</p>
             </div>
             <fieldset class="form-group">
-                <legend>Group(s)</legend>
-                <div *ng-for="#group of activeOrgUnit.organisationUnitGroups">
-                    <input class="form-control" type="text" [(ng-model)]="group.name">
+                <Legend>Coordinates</Legend>
+                <div *ng-if="featureType.value == 'POINT'" class="form-group">
+                    <label>Latitude</label>
+                    <input class="form-control" type="number" ng-control="lat" #lat="form" step="any" max="90" min="-90"/>
+                    <label>Longitude</label>
+                    <input class="form-control" type="number" ng-control="lng" #lng="form" step="any" max="180" min="-180"/>
                 </div>
+                <div *ng-if="featureType.value == 'NONE'" class="alert alert-danger">
+                    <p>This organisation unit has no associated coordinates</p>
+                </div>
+            </fieldset>
+
+
+            <fieldset class="form-group">
+                <legend>Contact information</legend>
+                <label>Contact person</label>
+                <input class="form-control" type="text" ng-control="contactPerson"/>
+                <label>Address</label>
+                <input class="form-control" type="text" ng-control="address"/>
+                <label>E-mail</label>
+                <input class="form-control" type="email" ng-control="email"/>
+                <label>Phone number</label>
+                <input class="form-control" type="text" ng-control="phoneNumber"/>
             </fieldset>
             <button type="button" (click)="cancel()" class="btn btn-default">Cancel</button>
-            <button type="submit" [disabled]="!of.form.valid" class="btn btn-default">{{activeOrgUnit.id? "Update" :"Add"}}</button>
+            <button type="submit" [disabled]="!of.form.valid" class="btn btn-default">{{newObject? "Add":"Update"}}
+            </button>
 
         </form>
 
+
         <section *ng-if="!editmode">
+            <h2>Organisation Unit</h2>
             <label for="actOrgUnitName">Name</label>
 
-            <p id="actOrgUnitName">{{(activeOrgUnit.name) || "[None]"}}</p>
+            <p id="actOrgUnitName">{{(form.controls.name.value) || "[None]"}}</p>
 
             <label for="actOrgUnitShortName">Short Name</label>
 
-            <p id="actOrgUnitShortName">{{(activeOrgUnit.shortName)||["None"]}}</p>
+            <p id="actOrgUnitShortName">{{(form.controls.shortName.value)||["None"]}}</p>
 
             <label for="actOrgUnitDescription">Description</label>
 
-            <p id="actOrgUnitDescription">{{(activeOrgUnit.description)||"None"}}</p>
+            <p id="actOrgUnitDescription">{{(form.controls.description.value)||"None"}}</p>
 
             <label for="actOrgUnitCode">Code</label>
 
-            <p id="actOrgUnitCode">{{(activeOrgUnit.code)||["None"]}}</p>
+            <p id="actOrgUnitCode">{{(form.controls.code.value)||["None"]}}</p>
 
             <label for="actOrgUnitOpeningDate">Opening Date</label>
 
-            <p id="actOrgUnitOpeningDate">{{activeOrgUnit.openingDate||["None"]}}</p>
+            <p id="actOrgUnitOpeningDate">{{form.controls.openingDate.value||["None"]}}</p>
 
             <label for="actOrgUnitClosingDate">Closed Date</label>
 
-            <p id="actOrgUnitClosingDate">{{activeOrgUnit.closingDate||["None"]}}</p>
+            <p id="actOrgUnitClosingDate">{{form.controls.closedDate.value||["None"]}}</p>
 
             <label for="actOrgUnitURL">Url</label>
 
-            <p id="actOrgUnitURL">{{(activeOrgUnit.url) ||["None"]}}</p>
+            <p id="actOrgUnitURL">{{(form.controls.url.value) ||["None"]}}</p>
+
+            <fieldset>
+                <legend>Coordinates</legend>
+                <div *ng-if="featureType.value == 'POINT'" class="form-group">
+                    <label>Latitude</label>
+                    <p>{{form.controls.lat.value}}</p>
+                    <label>Longitude</label>
+                    <p>{{form.controls.lng.value}}</p>
+                </div>
+                <div *ng-if="featureType.value == 'NONE'" class="alert alert-danger">
+                    <p>This organisation unit has no associated coordinates</p>
+                </div>
+                <div *ng-if="featureType.value == 'POLYGON' || featureType.value == 'MULTI_POLYGON'">
+                    <p>polygon</p>
+                </div>
 
-            <label>Group(s)</label>
-            <ul *ng-for="#group of activeOrgUnit.organisationUnitGroups">
-                <li>{{group.name}}</li>
-            </ul>
+            </fieldset>
+
+            <fieldset>
+                <legend>Contact Information</legend>
+                <label>Contact person</label>
+                <p>{{form.controls.contactPerson.value || ["None"]}}</p>
+                <label>Address</label>
+                <p>{{form.controls.address.value || ["None"]}}</p>
+                <label>E-mail</label>
+                <p>{{form.controls.email.value || ["None"]}}</p>
+                <label>Phone number</label>
+                <p>{{form.controls.phoneNumber.vaule || ["None"]}}</p>
+            </fieldset>
             <button class="btn btn-default" (click)="editmode = !editmode">Edit</button>
         </section>
 
-
     </div>
 </div>
\ No newline at end of file