u/erikhf/frm.git
3 years agoMade filterbutton toggle from ts and not html
Yrjan A. F. Fraschetti [Thu, 10 Dec 2015 17:57:29 +0000]
Made filterbutton toggle from ts and not html

3 years agoCleanup in search
Yrjan A. F. Fraschetti [Thu, 10 Dec 2015 17:52:34 +0000]
Cleanup in search

3 years agoFixed merge conflicts
Yrjan A. F. Fraschetti [Thu, 10 Dec 2015 17:10:16 +0000]
Fixed merge conflicts

3 years agoSmall fixes in filter gui
Yrjan A. F. Fraschetti [Thu, 10 Dec 2015 17:08:41 +0000]
Small fixes in filter gui

3 years ago[bugfix] edit and add positions
Erik Haider Forsén [Thu, 10 Dec 2015 17:06:01 +0000]
[bugfix] edit and add positions

3 years agoroza og julie masseee farger
Roza Moustafa [Thu, 10 Dec 2015 16:53:31 +0000]
roza og julie masseee farger

3 years agoMerge branch 'master' of git.uio.no:u/erikhf/frm
Roza Moustafa [Thu, 10 Dec 2015 16:51:24 +0000]
Merge branch 'master' of git.uio.no:u/erikhf/frm

3 years agomer design alle gly paa plass
Roza Moustafa [Thu, 10 Dec 2015 16:50:50 +0000]
mer design alle gly paa plass

3 years agomer design og fikset at no result forsvinner igjen ved sidebar open
Roza Moustafa [Thu, 10 Dec 2015 16:44:51 +0000]
mer design og fikset at no result forsvinner igjen ved sidebar open

3 years agosidebar design oppdatert
Roza Moustafa [Thu, 10 Dec 2015 16:23:15 +0000]
sidebar design oppdatert

3 years agomer design
Roza Moustafa [Thu, 10 Dec 2015 15:54:30 +0000]
mer design

3 years agokommentarer, ryddet i koden
Roza Moustafa [Thu, 10 Dec 2015 15:17:50 +0000]
kommentarer, ryddet i koden

3 years agocommented code i map.ts
Julie Hill Roa [Thu, 10 Dec 2015 15:17:17 +0000]
commented code i map.ts

3 years agobugfix
Julie Hill Roa [Thu, 10 Dec 2015 14:48:27 +0000]
bugfix

3 years agoMerge branch 'colorpolygon'
Julie Hill Roa [Thu, 10 Dec 2015 14:44:56 +0000]
Merge branch 'colorpolygon'

* colorpolygon:
  commented out tooltip
  bugfix
  changes colors
  [colorpolygon] added tooptip if we want
  changed colors on polygon

3 years agocommented out tooltip colorpolygon
Julie Hill Roa [Thu, 10 Dec 2015 14:43:50 +0000]
commented out tooltip

3 years agoMerge branch 'roza'
Roza Moustafa [Thu, 10 Dec 2015 13:08:50 +0000]
Merge branch 'roza'

3 years agobugfix
Julie Hill Roa [Wed, 9 Dec 2015 20:13:01 +0000]
bugfix

3 years agochanges colors
Julie Hill Roa [Wed, 9 Dec 2015 20:09:49 +0000]
changes colors

3 years agomerge med master
Julie Hill Roa [Wed, 9 Dec 2015 20:09:38 +0000]
merge med master

3 years agobugfix
Julie Hill Roa [Wed, 9 Dec 2015 19:18:25 +0000]
bugfix

3 years agoflyttet css sidebar til map, og designet alle sidebar-elementer
Roza Moustafa [Tue, 8 Dec 2015 17:13:39 +0000]
flyttet css sidebar til map, og designet alle  sidebar-elementer

3 years agoAdded some comments to search
Yrjan A. F. Fraschetti [Tue, 8 Dec 2015 13:45:20 +0000]
Added some comments to search

3 years agoCleanup of code in search
Yrjan A. F. Fraschetti [Tue, 8 Dec 2015 13:29:05 +0000]
Cleanup of code in search

3 years agoMerge branch 'master' of git.uio.no:u/erikhf/frm
Julie Hill Roa [Sun, 6 Dec 2015 18:53:33 +0000]
Merge branch 'master' of git.uio.no:u/erikhf/frm

* 'master' of git.uio.no:u/erikhf/frm:
  litt design

3 years agoquick bug fix
Julie Hill Roa [Sun, 6 Dec 2015 18:53:28 +0000]
quick bug fix

3 years agolitt design
Roza Moustafa [Sun, 6 Dec 2015 18:47:03 +0000]
litt design

3 years ago[pair-programming] final touch
Erik Haider Forsén [Sun, 6 Dec 2015 18:35:35 +0000]
[pair-programming] final touch

3 years agomerge
Julie Hill Roa [Sun, 6 Dec 2015 16:46:52 +0000]
merge

3 years agomerge faardih
Roza Moustafa [Sun, 6 Dec 2015 16:37:51 +0000]
merge faardih

3 years agostart paa modal cleanupResult
Roza Moustafa [Sun, 6 Dec 2015 16:27:58 +0000]
start paa modal

3 years agoMerge branch 'addedit'
Erik Haider Forsén [Sun, 6 Dec 2015 16:27:55 +0000]
Merge branch 'addedit'

* addedit:
  [sidebar] Tried to add organisationUnitGroups, unsuccessful
  [sibebar] added polygon
  [sidebar] Added warning if org unit doesn't have coordinates. Added more contact information to sidebar
  [sidebar] Date is now working properly on read and write
  [bugfix] If "featureType" is not present in PUT request, it will be set to "NONE" in the API. Fixed

3 years ago[sidebar] Tried to add organisationUnitGroups, unsuccessful addedit
Erik Haider Forsén [Sun, 6 Dec 2015 16:26:25 +0000]
[sidebar] Tried to add organisationUnitGroups, unsuccessful

3 years agoAdded a beatiful design to the sidebar sidebardesign
Yrjan A. F. Fraschetti [Sun, 6 Dec 2015 16:24:00 +0000]
Added a beatiful design to the sidebar

3 years agolitt design av filtermeny + plassering
Roza Moustafa [Sun, 6 Dec 2015 15:25:21 +0000]
litt design av filtermeny + plassering

3 years agoMerge branch 'master' of git.uio.no:u/erikhf/frm
Julie Hill Roa [Sun, 6 Dec 2015 15:06:50 +0000]
Merge branch 'master' of git.uio.no:u/erikhf/frm

* 'master' of git.uio.no:u/erikhf/frm:
  Cleanup
  Added message for no result when searching

3 years ago[colorpolygon] added tooptip if we want
Julie Hill Roa [Sun, 6 Dec 2015 15:05:49 +0000]
[colorpolygon] added tooptip if we want

3 years agoCleanup
Yrjan A. F. Fraschetti [Sun, 6 Dec 2015 14:56:02 +0000]
Cleanup

3 years agochanged colors on polygon
Julie Hill Roa [Sun, 6 Dec 2015 14:38:43 +0000]
changed colors on polygon

3 years agosearchbar design, lukke resultat, hoyde med scroll og tomme inputen + plassering
Roza Moustafa [Sun, 6 Dec 2015 14:35:51 +0000]
searchbar design, lukke resultat, hoyde med scroll og tomme inputen + plassering

3 years agoMerge branch 'searchbug'
Yrjan A. F. Fraschetti [Sun, 6 Dec 2015 14:24:38 +0000]
Merge branch 'searchbug'
Added message for when there is no result in search

3 years agoAdded message for no result when searching searchbug
Yrjan A. F. Fraschetti [Sun, 6 Dec 2015 14:23:29 +0000]
Added message for no result when searching

3 years agoMerge branch 'centermap'
Julie Hill Roa [Sun, 6 Dec 2015 14:16:42 +0000]
Merge branch 'centermap'

* centermap:
  [centermap] centering map on last point
  focus on points

3 years ago[centermap] centering map on last point centermap
Julie Hill Roa [Sun, 6 Dec 2015 14:16:11 +0000]
[centermap] centering map on last point

3 years agoMerge branch 'searchbug'
Yrjan A. F. Fraschetti [Sun, 6 Dec 2015 12:49:50 +0000]
Merge branch 'searchbug'
Added new fix for updating search when filter is set

3 years agoFixed bug where search does not update when filter is set
Yrjan A. F. Fraschetti [Sun, 6 Dec 2015 12:42:07 +0000]
Fixed bug where search does not update when filter is set

3 years agofocus on points
Julie Hill Roa [Sun, 6 Dec 2015 12:29:02 +0000]
focus on points

3 years agoMerge branch 'searchbug'
Yrjan A. F. Fraschetti [Sun, 6 Dec 2015 11:54:42 +0000]
Merge branch 'searchbug'
Mostly bugfixes regarding search an filter

3 years agoFixed bugs where searchresult did not update, where searchlist got duplicated when...
Yrjan A. F. Fraschetti [Sun, 6 Dec 2015 11:51:38 +0000]
Fixed bugs where searchresult did not update, where searchlist got duplicated when filter was applied, and reset the searchlist when filter is removed

3 years ago[sibebar] added polygon
Erik Haider Forsén [Sun, 6 Dec 2015 11:32:08 +0000]
[sibebar] added polygon

3 years agodraw searched parent and markes searched as active drawserchedparent
Julie Hill Roa [Sun, 6 Dec 2015 11:18:59 +0000]
draw searched parent and markes searched as active

3 years ago[sidebar] Added warning if org unit doesn't have coordinates. Added more contact...
Erik Haider Forsén [Sun, 6 Dec 2015 10:55:19 +0000]
[sidebar] Added warning if org unit doesn't have coordinates. Added more contact information to sidebar

3 years ago[sidebar] Date is now working properly on read and write
Erik Haider Forsén [Sun, 6 Dec 2015 10:26:42 +0000]
[sidebar] Date is now working properly on read and write

3 years ago[bugfix] If "featureType" is not present in PUT request, it will be set to "NONE...
Erik Haider Forsén [Sun, 6 Dec 2015 09:11:43 +0000]
[bugfix] If "featureType" is not present in PUT request, it will be set to "NONE" in the API. Fixed

3 years ago[levels] modal buttons swaped levels
Julie Hill Roa [Sun, 6 Dec 2015 09:01:03 +0000]
[levels] modal buttons swaped

3 years ago[levels] map levelse more generic
Julie Hill Roa [Sun, 6 Dec 2015 09:00:38 +0000]
[levels] map levelse more generic

3 years agoeverything is working, great success
Erik Haider Forsén [Thu, 3 Dec 2015 21:54:55 +0000]
everything is working, great success

3 years agoyay merge
Erik Haider Forsén [Thu, 3 Dec 2015 21:45:54 +0000]
yay merge

3 years agomerge fun
Erik Haider Forsén [Thu, 3 Dec 2015 21:36:15 +0000]
merge fun

3 years agosome code fixes
Julie Hill Roa [Thu, 3 Dec 2015 21:06:18 +0000]
some code fixes

3 years agomerge with master
Julie Hill Roa [Thu, 3 Dec 2015 21:05:54 +0000]
merge with master

3 years agomerge filter og sookefelt funksjoner + litt redesign
Roza Moustafa [Thu, 3 Dec 2015 19:47:35 +0000]
merge filter og sookefelt funksjoner + litt redesign

3 years agoclean up
Julie Hill Roa [Thu, 3 Dec 2015 19:28:39 +0000]
clean up

3 years agofaa endringer
Roza Moustafa [Thu, 3 Dec 2015 19:26:22 +0000]
faa endringer

3 years agoMap position is updated live
Erik Haider Forsén [Thu, 3 Dec 2015 19:21:06 +0000]
Map position is updated live

3 years agoting oppaa kart
Roza Moustafa [Thu, 3 Dec 2015 18:14:09 +0000]
ting oppaa kart

3 years agoMerge branch 'navbar'
Yrjan A. F. Fraschetti [Thu, 3 Dec 2015 18:00:16 +0000]
Merge branch 'navbar'
Added new features for filtering

3 years agoAdded live filtering of search
Yrjan A. F. Fraschetti [Thu, 3 Dec 2015 17:57:43 +0000]
Added live filtering of search

3 years agoResolved merge conflixts
Julie Hill Roa [Thu, 3 Dec 2015 17:55:25 +0000]
Resolved merge conflixts

3 years ago[showdetails] pop up fixed !
Julie Hill Roa [Thu, 3 Dec 2015 17:35:19 +0000]
[showdetails] pop up fixed !

3 years ago[sidebar] fixed form design
Erik Haider Forsén [Thu, 3 Dec 2015 17:35:03 +0000]
[sidebar] fixed form design

3 years ago[fix] merge fix
Erik Haider Forsén [Thu, 3 Dec 2015 14:29:20 +0000]
[fix] merge fix

3 years agoMerge branch 'sidebar'
Erik Haider Forsén [Thu, 3 Dec 2015 14:12:42 +0000]
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

3 years ago[sidebar] Using model-driven form instead of data-driven form
Erik Haider Forsén [Thu, 3 Dec 2015 14:07:48 +0000]
[sidebar] Using model-driven form instead of data-driven form

3 years ago[showdetails]merged master itno showdetails
Julie Hill Roa [Thu, 3 Dec 2015 12:48:29 +0000]
[showdetails]merged master itno showdetails

3 years agomerge
Julie Hill Roa [Thu, 3 Dec 2015 12:45:57 +0000]
merge

3 years agomerge master i modalboks
Roza Moustafa [Thu, 3 Dec 2015 12:27:42 +0000]
merge master i modalboks

3 years agomodal over kart
Roza Moustafa [Thu, 3 Dec 2015 12:18:22 +0000]
modal over kart

3 years agomodal oppdatert med aa close fuksjon
Roza Moustafa [Thu, 3 Dec 2015 12:07:09 +0000]
modal oppdatert med aa close fuksjon

3 years ago[stylegeojson] merge conflict resolved
Julie Hill Roa [Thu, 3 Dec 2015 11:53:13 +0000]
[stylegeojson] merge conflict resolved

3 years agostyled
Julie Hill Roa [Thu, 3 Dec 2015 11:48:54 +0000]
styled

3 years agomerge modal
Roza Moustafa [Thu, 3 Dec 2015 11:11:48 +0000]
merge modal

3 years agomodal dukker opp ved trykk paa kart
Roza Moustafa [Thu, 3 Dec 2015 10:43:12 +0000]
modal dukker opp ved trykk paa kart

3 years agolitte code cleanup
Julie Hill Roa [Thu, 3 Dec 2015 10:13:03 +0000]
litte code cleanup

3 years agostyle update
Julie Hill Roa [Thu, 3 Dec 2015 09:55:14 +0000]
style update

3 years ago[drwparent] bug fix
Julie Hill Roa [Thu, 3 Dec 2015 09:38:35 +0000]
[drwparent] bug fix

3 years agohtml kode for modal
Roza Moustafa [Thu, 3 Dec 2015 09:35:21 +0000]
html kode for modal

3 years agodrawing parent for adding new orgU
Julie Hill Roa [Thu, 3 Dec 2015 08:43:40 +0000]
drawing parent for adding new orgU

3 years agoEndrer styling, map som body-background resten kommentert ut
Roza Moustafa [Thu, 3 Dec 2015 08:41:58 +0000]
Endrer styling, map som body-background resten kommentert ut

3 years agoFixed merge conflic in map.ts
Yrjan A. F. Fraschetti [Thu, 3 Dec 2015 07:26:38 +0000]
Fixed merge conflic in map.ts

3 years ago[sidebar] Working on adding object
Erik Haider Forsén [Tue, 1 Dec 2015 21:33:32 +0000]
[sidebar] Working on adding object

3 years agoMerge branch 'master' into sidebar
Erik Haider Forsén [Tue, 1 Dec 2015 20:05:31 +0000]
Merge branch 'master' into sidebar

* master:
  search done on map minus mapFocus
  [focusSearched] deleted all geoJson and drew up the search Unit
  [ExpandLevels] bug fixes, no expanding and going up works as it should
  [ExpandLevels] expandes up and down
  Trying to change style on marker
  expaned to alle levels downwords
  [AddOrgUnit] done, except one calling method
  [AddOrgUnit] removed geoLocation
  [AddOrgUnit] made a cool marker
  [ExpandLevels] getting childs array from dhis api
  [ExpansLevels] addListner on map only called once
  shit dont work

3 years agoImproved readability in search.ts
Yrjan A. F. Fraschetti [Tue, 1 Dec 2015 00:02:43 +0000]
Improved readability in search.ts

3 years agoAdded auto filling in filter selectors
Yrjan A. F. Fraschetti [Mon, 30 Nov 2015 23:33:25 +0000]
Added auto filling in filter selectors

3 years agoknapp som toommer search uten styling
Roza Moustafa [Sun, 29 Nov 2015 16:00:11 +0000]
knapp som toommer search uten styling

3 years agoSooke igjen etter aa ha klikket vekk fra sookeresultater
Roza Moustafa [Thu, 26 Nov 2015 20:44:59 +0000]
Sooke igjen etter aa ha klikket vekk fra sookeresultater

3 years agosearch done on map minus mapFocus
Julie Hill Roa [Thu, 26 Nov 2015 20:30:10 +0000]
search done on map minus mapFocus

3 years ago[focusSearched] deleted all geoJson and drew up the search Unit
Julie Hill Roa [Thu, 26 Nov 2015 19:59:54 +0000]
[focusSearched] deleted all geoJson and drew up the search Unit

3 years ago[ExpandLevels] bug fixes, no expanding and going up works as it should
Julie Hill Roa [Thu, 26 Nov 2015 19:13:16 +0000]
[ExpandLevels] bug fixes, no expanding and going up works as it should

3 years ago[ExpandLevels] expandes up and down
Julie Hill Roa [Thu, 26 Nov 2015 17:28:36 +0000]
[ExpandLevels] expandes up and down