u/erikhf/frm.git
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 agoCleanup
Yrjan A. F. Fraschetti [Sun, 6 Dec 2015 14:56:02 +0000]
Cleanup

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 '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 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 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[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

3 years agoWorking on filling in selectors for filter
Yrjan A. F. Fraschetti [Thu, 26 Nov 2015 17:07:56 +0000]
Working on filling in selectors for filter

3 years agoSookeresultater forsvinner naar sookefeltet er tomt og naar resultatlista blir klikke...
Roza Moustafa [Thu, 26 Nov 2015 15:35:14 +0000]
Sookeresultater forsvinner naar sookefeltet er tomt og naar resultatlista blir klikket paa

3 years agomerged AddorgUnit into ExpandLevels
Julie Hill Roa [Thu, 26 Nov 2015 14:07:34 +0000]
merged AddorgUnit into ExpandLevels

3 years agoTrying to change style on marker
Julie Hill Roa [Thu, 26 Nov 2015 14:02:31 +0000]
Trying to change style on marker

3 years agoexpaned to alle levels downwords
Julie Hill Roa [Thu, 26 Nov 2015 13:42:41 +0000]
expaned to alle levels downwords

3 years agoToomme filtering ved aa klikke vekk dropdown meny
Roza Moustafa [Thu, 26 Nov 2015 13:16:47 +0000]
Toomme filtering ved aa klikke vekk dropdown meny

3 years ago[AddOrgUnit] done, except one calling method
Julie Hill Roa [Thu, 26 Nov 2015 13:15:14 +0000]
[AddOrgUnit] done, except one calling method

3 years ago[AddOrgUnit] removed geoLocation
Julie Hill Roa [Thu, 26 Nov 2015 13:01:11 +0000]
[AddOrgUnit] removed geoLocation

3 years ago[AddOrgUnit] made a cool marker
Julie Hill Roa [Thu, 26 Nov 2015 12:32:41 +0000]
[AddOrgUnit] made a cool marker

3 years ago[sidebar] Functionality to cancel editing
Erik Haider Forsén [Thu, 26 Nov 2015 12:10:44 +0000]
[sidebar] Functionality to cancel editing

3 years ago[sidebar] Update existing organizational unit
Erik Haider Forsén [Thu, 26 Nov 2015 11:27:12 +0000]
[sidebar] Update existing organizational unit

3 years ago[ExpandLevels] getting childs array from dhis api
Julie Hill Roa [Thu, 26 Nov 2015 11:22:29 +0000]
[ExpandLevels] getting childs array from dhis api

3 years agoFixed issue with filter where multiple instances of an object appered when no filter...
Yrjan A. F. Fraschetti [Thu, 26 Nov 2015 09:55:26 +0000]
Fixed issue with filter where multiple instances of an object appered when no filter was added

3 years agoMerge branch 'sidebar'
Erik Haider Forsén [Thu, 26 Nov 2015 09:51:24 +0000]
Merge branch 'sidebar'

* sidebar:
  [sidebar] template for showing and editing a organization unit
  [sidebar] Showing basic information on side panel
  [sidebar] Skeleton up

# Conflicts:
# src/components/app.html
# src/components/app.ts
# src/components/sidebar/sidebar.html
# src/components/sidebar/sidebar.ts

3 years agoMerge branch 'sidebar'
Erik Haider Forsén [Thu, 26 Nov 2015 09:20:21 +0000]
Merge branch 'sidebar'

* sidebar:
  [sidebar] template for showing and editing a organization unit
  [sidebar] Showing basic information on side panel
  [sidebar] Skeleton up

# Conflicts:
# src/components/app.html
# src/components/app.ts
# src/components/sidebar/sidebar.html
# src/components/sidebar/sidebar.ts

3 years ago[ExpansLevels] addListner on map only called once
Julie Hill Roa [Thu, 26 Nov 2015 09:19:05 +0000]
[ExpansLevels] addListner on map only called once

3 years agoAdded select
Yrjan A. F. Fraschetti [Thu, 26 Nov 2015 09:15:25 +0000]
Added select

3 years agoMerge branch 'navbar' of git.uio.no:u/erikhf/frm into navbar
Yrjan A. F. Fraschetti [Thu, 26 Nov 2015 09:13:37 +0000]
Merge branch 'navbar' of git.uio.no:u/erikhf/frm into navbar

# Conflicts:
# src/components/navbar/navbar.html

3 years agoAdded selectors for filter
Yrjan A. F. Fraschetti [Thu, 26 Nov 2015 09:07:27 +0000]
Added selectors for filter

3 years agoshit dont work
Julie Hill Roa [Thu, 26 Nov 2015 09:07:17 +0000]
shit dont work

3 years ago[sidebar] template for showing and editing a organization unit
Erik Haider Forsén [Thu, 26 Nov 2015 09:05:18 +0000]
[sidebar] template for showing and editing a organization unit

3 years agooppdatert dropdown med selector
Roza Moustafa [Thu, 26 Nov 2015 08:59:50 +0000]
oppdatert dropdown med selector

3 years agoTester maater aa presentere filtererng paa i dropdwon-menyen
Roza Moustafa [Tue, 24 Nov 2015 21:01:57 +0000]
Tester maater aa presentere filtererng paa i dropdwon-menyen

3 years agoBorder og skygge paa sookefelt og dropdown-knapp, endre farge ved focus
Roza Moustafa [Tue, 24 Nov 2015 19:49:29 +0000]
Border og skygge paa sookefelt og dropdown-knapp, endre farge ved focus

3 years agoOppned knapp for dropdown-menyen funker som det skal
Roza Moustafa [Tue, 24 Nov 2015 19:47:36 +0000]
Oppned knapp for dropdown-menyen funker som det skal

3 years agolagt paa skygge
Roza Moustafa [Tue, 24 Nov 2015 19:45:01 +0000]
lagt  paa skygge

3 years agomerge!
Yrjan A. F. Fraschetti [Sun, 22 Nov 2015 21:24:45 +0000]
merge!

3 years agoMerge
Yrjan A. F. Fraschetti [Sun, 22 Nov 2015 21:22:29 +0000]
Merge

3 years ago[maps] removed markers
Erik Haider Forsén [Thu, 19 Nov 2015 19:50:49 +0000]
[maps] removed markers

3 years agoFixed events between components
Erik Haider Forsén [Thu, 19 Nov 2015 19:48:30 +0000]
Fixed events between components

3 years agoMerge branch 'map'
Julie Hill Roa [Thu, 19 Nov 2015 19:38:07 +0000]
Merge branch 'map'

* map:
  [map] removed other layers wehn moving down to next level
  [map] This fix
  [map] get id of clicked polygon
  [map] got contact with layer
  rest call for layer 2 and show it on map

3 years ago[map] removed other layers wehn moving down to next level
Julie Hill Roa [Thu, 19 Nov 2015 19:36:04 +0000]
[map] removed other layers wehn moving down to next level

3 years agoMerge branch 'navbar'
Roza Moustafa [Thu, 19 Nov 2015 19:08:06 +0000]
Merge branch 'navbar'

# Conflicts:
# src/components/app.html
# src/components/map/map.ts
# src/components/search/search.ts

3 years agodesign av nav, search og en liten dropdown meny
Roza Moustafa [Thu, 19 Nov 2015 18:57:44 +0000]
design av nav, search og en liten dropdown meny

3 years ago[map] This fix
Erik Haider Forsén [Thu, 19 Nov 2015 18:46:11 +0000]
[map] This fix

3 years ago[sidebar] Showing basic information on side panel
Erik Haider Forsén [Thu, 19 Nov 2015 18:32:50 +0000]
[sidebar] Showing basic information on side panel

3 years ago[map] get id of clicked polygon
Julie Hill Roa [Thu, 19 Nov 2015 18:21:51 +0000]
[map] get id of clicked polygon

3 years ago[sidebar] Skeleton up
Erik Haider Forsén [Thu, 19 Nov 2015 17:41:50 +0000]
[sidebar] Skeleton up

3 years ago[map] got contact with layer
Julie Hill Roa [Thu, 19 Nov 2015 17:19:30 +0000]
[map] got contact with layer

3 years ago[search][map] Sending ID of clicked search result to map component
Erik Haider Forsén [Thu, 19 Nov 2015 17:01:35 +0000]
[search][map] Sending ID of clicked search result to map component

3 years agorest call for layer 2 and show it on map
Julie Hill Roa [Thu, 19 Nov 2015 15:21:32 +0000]
rest call for layer 2 and show it on map

3 years agoAdded a filter method in livesearch
Yrjan A. F. Fraschetti [Thu, 19 Nov 2015 14:47:10 +0000]
Added a filter method in livesearch

3 years agoMerge branch 'map'
Julie Hill Roa [Thu, 19 Nov 2015 09:13:45 +0000]
Merge branch 'map'

* map:
  Added "this is you" marker
  Added "this is you" marker
  Added "this is you" marker

3 years agoAdded "this is you" marker
Julie Hill Roa [Thu, 19 Nov 2015 08:56:26 +0000]
Added "this is you" marker

3 years agoAdded "this is you" marker
Julie Hill Roa [Mon, 16 Nov 2015 07:05:07 +0000]
Added "this is you" marker