From: Erik Haider Forsén <erikhf@ifi.uio.no>
Date: Thu, 3 Dec 2015 14:12:42 +0000 (+0100)
Subject: Merge branch 'sidebar'
X-Git-Url: http://git.uio.no/git/?p=u%2Ferikhf%2Ffrm.git;a=commitdiff_plain;h=33b253bf27a8e65d45d50609085f8b1a0354507a

Merge branch 'sidebar'

* sidebar:
  [sidebar] Using model-driven form instead of data-driven form
  [sidebar] Working on adding object
  [sidebar] Functionality to cancel editing
  [sidebar] Update existing organizational unit

# Conflicts:
#	src/components/map/map.ts
---

33b253bf27a8e65d45d50609085f8b1a0354507a
diff --cc src/components/map/map.ts
index b69817d,97ea4c1..d4e1ecf
--- a/src/components/map/map.ts
+++ b/src/components/map/map.ts
@@@ -12,20 -12,17 +12,20 @@@ import {Headers, Http} from 'angular2/h
  
  export class Map {
  
 +    hideModal: any;
      map:Object;
 -    http: Http;
 -    LEVEL: number;
 -    runned: boolean;
 -    parent: Object;
 -    currentPos : Object;
 -    uprunned: boolean;
 +    http:Http;
 +    LEVEL:number;
 +    runned:boolean;
 +    parent:Object;
 +    currentPos:Object;
 +    uprunned:boolean;
 +    // COLORS:Object;
 +
      constructor(http:Http) {
          this.newactive = new EventEmitter();
-         this.newOrg = new EventEmitter();
-         this.map = new google.maps.Map(document.getElementById("map"), {center: {lat: 0, lng: 0}, zoom: 12});
+         this.neworg = new EventEmitter();
+         this.map = new google.maps.Map(document.getElementById("map"),{center: {lat:0,lng:0}, zoom:12});
          this.init();
          this.http = http;
          this.LEVEL = 2;
@@@ -293,13 -282,20 +293,13 @@@
          let pos = this.getcurrentPos();
          let lat = pos.lat();
          let lng = pos.lng()
 -        let location= {lat: lat, lng: lng};
 -        let event =  {location,parent};
 +        let location = {lat: lat, lng: lng};
 +        let event = {location, parent};
-         this.newOrg.next(event);
+         this.neworg.next(event);
 -
      }
  
 -    myFunction(){
 -        console.log("Inne i myfunksjonen");
 -    }
 -
 -
 -    update(event){
 +    update(event) {
          this.newactive.next(event);
 -        let getResult = Object;
          let test = this.getMap();
          let http = this.getHttp();