]>
git.uio.no Git - u/erikhf/frm.git/log
Erik Haider Forsén [Thu, 3 Dec 2015 19:21:06 +0000 (20:21 +0100)]
Map position is updated live
Yrjan A. F. Fraschetti [Thu, 3 Dec 2015 18:00:16 +0000 (19:00 +0100)]
Merge branch 'navbar'
Added new features for filtering
Yrjan A. F. Fraschetti [Thu, 3 Dec 2015 17:57:43 +0000 (18:57 +0100)]
Added live filtering of search
Julie Hill Roa [Thu, 3 Dec 2015 17:55:25 +0000 (18:55 +0100)]
Resolved merge conflixts
Julie Hill Roa [Thu, 3 Dec 2015 17:35:19 +0000 (18:35 +0100)]
[showdetails] pop up fixed !
Erik Haider Forsén [Thu, 3 Dec 2015 17:35:03 +0000 (18:35 +0100)]
[sidebar] fixed form design
Erik Haider Forsén [Thu, 3 Dec 2015 14:29:20 +0000 (15:29 +0100)]
[fix] merge fix
Erik Haider Forsén [Thu, 3 Dec 2015 14:12:42 +0000 (15:12 +0100)]
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
Erik Haider Forsén [Thu, 3 Dec 2015 14:07:48 +0000 (15:07 +0100)]
[sidebar] Using model-driven form instead of data-driven form
Julie Hill Roa [Thu, 3 Dec 2015 12:48:29 +0000 (13:48 +0100)]
[showdetails]merged master itno showdetails
Julie Hill Roa [Thu, 3 Dec 2015 12:45:57 +0000 (13:45 +0100)]
merge
Roza Moustafa [Thu, 3 Dec 2015 12:27:42 +0000 (13:27 +0100)]
merge master i modalboks
Roza Moustafa [Thu, 3 Dec 2015 12:18:22 +0000 (13:18 +0100)]
modal over kart
Roza Moustafa [Thu, 3 Dec 2015 12:07:09 +0000 (13:07 +0100)]
modal oppdatert med aa close fuksjon
Julie Hill Roa [Thu, 3 Dec 2015 11:53:13 +0000 (12:53 +0100)]
[stylegeojson] merge conflict resolved
Julie Hill Roa [Thu, 3 Dec 2015 11:48:54 +0000 (12:48 +0100)]
styled
Roza Moustafa [Thu, 3 Dec 2015 11:11:48 +0000 (12:11 +0100)]
merge modal
Roza Moustafa [Thu, 3 Dec 2015 10:43:12 +0000 (11:43 +0100)]
modal dukker opp ved trykk paa kart
Julie Hill Roa [Thu, 3 Dec 2015 10:13:03 +0000 (11:13 +0100)]
litte code cleanup
Julie Hill Roa [Thu, 3 Dec 2015 09:55:14 +0000 (10:55 +0100)]
style update
Julie Hill Roa [Thu, 3 Dec 2015 09:38:35 +0000 (10:38 +0100)]
[drwparent] bug fix
Roza Moustafa [Thu, 3 Dec 2015 09:35:21 +0000 (10:35 +0100)]
html kode for modal
Julie Hill Roa [Thu, 3 Dec 2015 08:43:40 +0000 (09:43 +0100)]
drawing parent for adding new orgU
Yrjan A. F. Fraschetti [Thu, 3 Dec 2015 07:26:38 +0000 (08:26 +0100)]
Fixed merge conflic in map.ts
Erik Haider Forsén [Tue, 1 Dec 2015 21:33:32 +0000 (22:33 +0100)]
[sidebar] Working on adding object
Erik Haider Forsén [Tue, 1 Dec 2015 20:05:31 +0000 (21:05 +0100)]
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
Yrjan A. F. Fraschetti [Tue, 1 Dec 2015 00:02:43 +0000 (01:02 +0100)]
Improved readability in search.ts
Yrjan A. F. Fraschetti [Mon, 30 Nov 2015 23:33:25 +0000 (00:33 +0100)]
Added auto filling in filter selectors
Julie Hill Roa [Thu, 26 Nov 2015 20:30:10 +0000 (21:30 +0100)]
search done on map minus mapFocus
Julie Hill Roa [Thu, 26 Nov 2015 19:59:54 +0000 (20:59 +0100)]
[focusSearched] deleted all geoJson and drew up the search Unit
Julie Hill Roa [Thu, 26 Nov 2015 19:13:16 +0000 (20:13 +0100)]
[ExpandLevels] bug fixes, no expanding and going up works as it should
Julie Hill Roa [Thu, 26 Nov 2015 17:28:36 +0000 (18:28 +0100)]
[ExpandLevels] expandes up and down
Yrjan A. F. Fraschetti [Thu, 26 Nov 2015 17:07:56 +0000 (18:07 +0100)]
Working on filling in selectors for filter
Julie Hill Roa [Thu, 26 Nov 2015 14:07:34 +0000 (15:07 +0100)]
merged AddorgUnit into ExpandLevels
Julie Hill Roa [Thu, 26 Nov 2015 14:02:31 +0000 (15:02 +0100)]
Trying to change style on marker
Julie Hill Roa [Thu, 26 Nov 2015 13:42:41 +0000 (14:42 +0100)]
expaned to alle levels downwords
Julie Hill Roa [Thu, 26 Nov 2015 13:15:14 +0000 (14:15 +0100)]
[AddOrgUnit] done, except one calling method
Julie Hill Roa [Thu, 26 Nov 2015 13:01:11 +0000 (14:01 +0100)]
[AddOrgUnit] removed geoLocation
Julie Hill Roa [Thu, 26 Nov 2015 12:32:41 +0000 (13:32 +0100)]
[AddOrgUnit] made a cool marker
Erik Haider Forsén [Thu, 26 Nov 2015 12:10:44 +0000 (13:10 +0100)]
[sidebar] Functionality to cancel editing
Erik Haider Forsén [Thu, 26 Nov 2015 11:27:12 +0000 (12:27 +0100)]
[sidebar] Update existing organizational unit
Julie Hill Roa [Thu, 26 Nov 2015 11:22:29 +0000 (12:22 +0100)]
[ExpandLevels] getting childs array from dhis api
Yrjan A. F. Fraschetti [Thu, 26 Nov 2015 09:55:26 +0000 (10:55 +0100)]
Fixed issue with filter where multiple instances of an object appered when no filter was added
Erik Haider Forsén [Thu, 26 Nov 2015 09:51:24 +0000 (10:51 +0100)]
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
Erik Haider Forsén [Thu, 26 Nov 2015 09:20:21 +0000 (10:20 +0100)]
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
Julie Hill Roa [Thu, 26 Nov 2015 09:19:05 +0000 (10:19 +0100)]
[ExpansLevels] addListner on map only called once
Yrjan A. F. Fraschetti [Thu, 26 Nov 2015 09:15:25 +0000 (10:15 +0100)]
Added select
Yrjan A. F. Fraschetti [Thu, 26 Nov 2015 09:13:37 +0000 (10:13 +0100)]
Merge branch 'navbar' of git.uio.no:u/erikhf/frm into navbar
# Conflicts:
# src/components/navbar/navbar.html
Yrjan A. F. Fraschetti [Thu, 26 Nov 2015 09:07:27 +0000 (10:07 +0100)]
Added selectors for filter
Julie Hill Roa [Thu, 26 Nov 2015 09:07:17 +0000 (10:07 +0100)]
shit dont work
Erik Haider Forsén [Thu, 26 Nov 2015 09:05:18 +0000 (10:05 +0100)]
[sidebar] template for showing and editing a organization unit
Roza Moustafa [Thu, 26 Nov 2015 08:59:50 +0000 (09:59 +0100)]
oppdatert dropdown med selector
Roza Moustafa [Tue, 24 Nov 2015 21:01:57 +0000 (22:01 +0100)]
Tester maater aa presentere filtererng paa i dropdwon-menyen
Roza Moustafa [Tue, 24 Nov 2015 19:49:29 +0000 (20:49 +0100)]
Border og skygge paa sookefelt og dropdown-knapp, endre farge ved focus
Roza Moustafa [Tue, 24 Nov 2015 19:47:36 +0000 (20:47 +0100)]
Oppned knapp for dropdown-menyen funker som det skal
Roza Moustafa [Tue, 24 Nov 2015 19:45:01 +0000 (20:45 +0100)]
lagt paa skygge
Yrjan A. F. Fraschetti [Sun, 22 Nov 2015 21:24:45 +0000 (22:24 +0100)]
merge!
Yrjan A. F. Fraschetti [Sun, 22 Nov 2015 21:22:29 +0000 (22:22 +0100)]
Merge
Erik Haider Forsén [Thu, 19 Nov 2015 19:50:49 +0000 (20:50 +0100)]
[maps] removed markers
Erik Haider Forsén [Thu, 19 Nov 2015 19:48:30 +0000 (20:48 +0100)]
Fixed events between components
Julie Hill Roa [Thu, 19 Nov 2015 19:38:07 +0000 (20:38 +0100)]
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
Julie Hill Roa [Thu, 19 Nov 2015 19:36:04 +0000 (20:36 +0100)]
[map] removed other layers wehn moving down to next level
Roza Moustafa [Thu, 19 Nov 2015 19:08:06 +0000 (20:08 +0100)]
Merge branch 'navbar'
# Conflicts:
# src/components/app.html
# src/components/map/map.ts
# src/components/search/search.ts
Roza Moustafa [Thu, 19 Nov 2015 18:57:44 +0000 (19:57 +0100)]
design av nav, search og en liten dropdown meny
Erik Haider Forsén [Thu, 19 Nov 2015 18:46:11 +0000 (19:46 +0100)]
[map] This fix
Erik Haider Forsén [Thu, 19 Nov 2015 18:32:50 +0000 (19:32 +0100)]
[sidebar] Showing basic information on side panel
Julie Hill Roa [Thu, 19 Nov 2015 18:21:51 +0000 (19:21 +0100)]
[map] get id of clicked polygon
Erik Haider Forsén [Thu, 19 Nov 2015 17:41:50 +0000 (18:41 +0100)]
[sidebar] Skeleton up
Julie Hill Roa [Thu, 19 Nov 2015 17:19:30 +0000 (18:19 +0100)]
[map] got contact with layer
Erik Haider Forsén [Thu, 19 Nov 2015 17:01:35 +0000 (18:01 +0100)]
[search][map] Sending ID of clicked search result to map component
Julie Hill Roa [Thu, 19 Nov 2015 15:21:32 +0000 (16:21 +0100)]
rest call for layer 2 and show it on map
Yrjan A. F. Fraschetti [Thu, 19 Nov 2015 14:47:10 +0000 (15:47 +0100)]
Added a filter method in livesearch
Julie Hill Roa [Thu, 19 Nov 2015 09:13:45 +0000 (10:13 +0100)]
Merge branch 'map'
* map:
Added "this is you" marker
Added "this is you" marker
Added "this is you" marker
Julie Hill Roa [Thu, 19 Nov 2015 08:56:26 +0000 (09:56 +0100)]
Added "this is you" marker
Julie Hill Roa [Mon, 16 Nov 2015 07:05:07 +0000 (08:05 +0100)]
Added "this is you" marker
Julie Hill Roa [Mon, 16 Nov 2015 06:58:36 +0000 (07:58 +0100)]
Added "this is you" marker
Erik Haider Forsén [Sun, 15 Nov 2015 15:55:39 +0000 (16:55 +0100)]
[navbar] Renamed some links
Erik Haider Forsén [Sun, 15 Nov 2015 15:52:07 +0000 (16:52 +0100)]
[navbar] Created navbar, moved search component from app to navbar.
Erik Haider Forsén [Sun, 15 Nov 2015 15:30:21 +0000 (16:30 +0100)]
[search] Styling the search input and results
Erik Haider Forsén [Sun, 15 Nov 2015 13:25:04 +0000 (14:25 +0100)]
[search] Moved styles to separate css file
Erik Haider Forsén [Sun, 15 Nov 2015 11:49:42 +0000 (12:49 +0100)]
[search] Make search result clickable
Erik Haider Forsén [Sat, 14 Nov 2015 14:33:39 +0000 (15:33 +0100)]
[search] Code cleanup
Erik Haider Forsén [Sat, 14 Nov 2015 14:30:31 +0000 (15:30 +0100)]
Merge branch 'master' into search
* master:
Revert "[apiService] created a service for getting the API URL"
# Conflicts:
# src/components/app.ts
# src/index.html
Erik Haider Forsén [Sat, 14 Nov 2015 14:27:56 +0000 (15:27 +0100)]
Revert "[apiService] created a service for getting the API URL"
This reverts commit
aca80f6a97807505358ebe0d62d58e3de67252c3 .
Erik Haider Forsén [Sat, 14 Nov 2015 13:04:45 +0000 (14:04 +0100)]
Merge branch 'master' into search
* master:
[apiService] created a service for getting the API URL
# Conflicts:
# src/components/app.ts
# src/index.html
Erik Haider Forsén [Sat, 14 Nov 2015 12:43:58 +0000 (13:43 +0100)]
[apiService] created a service for getting the API URL
Erik Haider Forsén [Sat, 14 Nov 2015 12:23:36 +0000 (13:23 +0100)]
[search] fixed api query, live/dynamic search is now working (verified on dhis-live platform)
Erik Haider Forsén [Sat, 14 Nov 2015 11:04:09 +0000 (12:04 +0100)]
Modified to query the api with the search string
Erik Haider Forsén [Sat, 14 Nov 2015 11:03:05 +0000 (12:03 +0100)]
No longer needed as we're using the query functionality in the API.
Erik Haider Forsén [Fri, 13 Nov 2015 17:46:09 +0000 (18:46 +0100)]
semi working live search
Erik Haider Forsén [Thu, 12 Nov 2015 15:01:58 +0000 (16:01 +0100)]
[search] experimenting with pipes
Erik Haider Forsén [Thu, 12 Nov 2015 13:11:13 +0000 (14:11 +0100)]
Fixed map (pair programming)
Erik Haider Forsén [Thu, 12 Nov 2015 12:01:58 +0000 (13:01 +0100)]
Fixed sample HTTP REST call to dhis api (pair programming)
Erik Haider Forsén [Thu, 12 Nov 2015 10:32:52 +0000 (11:32 +0100)]
Fixed placeholder for filter (pair programming)
Erik Haider Forsén [Thu, 12 Nov 2015 10:27:25 +0000 (11:27 +0100)]
Fixed placeholder for search (pair programming)
Erik Haider Forsén [Thu, 12 Nov 2015 10:24:01 +0000 (11:24 +0100)]
Fixed placeholder for map (pair programming)
Erik Haider Forsén [Thu, 12 Nov 2015 10:14:39 +0000 (11:14 +0100)]
New working structure after par programmering
Julie Hill Roa [Thu, 12 Nov 2015 08:25:05 +0000 (09:25 +0100)]
resdy to merge
Julie Hill Roa [Thu, 5 Nov 2015 14:03:03 +0000 (15:03 +0100)]
added a new structure
Erik Haider Forsén [Wed, 4 Nov 2015 14:29:09 +0000 (15:29 +0100)]
Updated gitignore