This repository was archived by the owner on Dec 17, 2024. It is now read-only.

Usody2018: Merge devel into master - #36

Open

forste wants to merge 133 commits into

usody2018-masterfrom

usody2018-devel

Commits on Apr 12, 2018

WIP Cleaning up resource view, list, etc.: Removing deprecated code (tabs, resource generators + factories, restructuring, etc.)
Stephan Fortelny
committed
4265eb9

Commits on Apr 13, 2018

WIP Cleaning up resource view, list, etc.
Stephan Fortelny
committed
7e52f09
WIP Cleaning up resource view, list, etc.
Stephan Fortelny
committed
110d60d

Commits on Apr 16, 2018

WIP Cleaning up resource view, list, etc.: Removed two ways of selecting devices
Stephan Fortelny
committed
d708c39
WIP Cleaning up resource view, list, etc.: Re-enabled double click on lots
Stephan Fortelny
committed
fda1a79
WIP Cleaning up resource view, list, etc.: Commented out unused groups (packages, pallets, places, ...)
Stephan Fortelny
committed
87e94de
WIP Get navigation to work: Entering lot works (one level with dummy data)
Stephan Fortelny
committed
816f006
WIP Right panel: Right panel displays info of (1st) selected device
Stephan Fortelny
committed
e7cd211

Commits on Apr 20, 2018

WIP Testing right panel: Display number of selected devices in Certificate button
Stephan Fortelny
committed
d9cf6bf
WIP Remove dashboard, packages, pallets and places: Removed from initial view and in nested views
Stephan Fortelny
committed
c03517b

Commits on Apr 23, 2018

Merge branch 'v1-easy-changes' into merge
Stephan Fortelny
committed
8c43e58
Revert CONSTANTS to use local server
Stephan Fortelny
committed
457406f
Merge branch 'merge' into prepare-for-redesign
Stephan Fortelny
committed
bd6b356
Merge branch 'v1-easy-changes' into prepare-for-redesign
Stephan Fortelny
committed
7047669
Merge branch 'v1-easy-changes' into prepare-for-redesign
Stephan Fortelny
committed
6ced5c6
Readded select all button to item list
Stephan Fortelny
committed
0c7abfa
Simplified organize button to only show buttons to add or remove from lot
Stephan Fortelny
committed
8c3957c
Info shown in right panel depends on selected items and type of items
Stephan Fortelny
committed
0f976f0
Stubs for summary of lot/selected items in right panel
Stephan Fortelny
committed
c064656
Remove number of selected items in certificate button
Stephan Fortelny
committed
c64d0c7
Inline buttons manipulating selected items directly in resource list directive and remove screener
Stephan Fortelny
committed
7d3547d

Commits on Apr 25, 2018

Merge branch 'devel' into prepare-for-redesign
Stephan Fortelny
committed
5a31f7a

Commits on Apr 26, 2018

WIP Display selected devices aggregated by lot in right panel: Refactored resource-list, rl-view, rl-getter and rl-selector to work with multiple lots.
Stephan Fortelny
committed
bbc6784
WIP Separate lots from devices in both view and directive. Added deselect buttons for lots
Stephan Fortelny
committed
1008ed3

Commits on Apr 27, 2018

WIP Display deselect button when all devices of current lot are selected. Display number of total and displayed devices above table. Display number of selected devices in selection panel
Stephan Fortelny
committed
7cb6a43
WIP Show aggregated information for multiple selected devices
Stephan Fortelny
committed
848f70f
WIP Added title and status columns and remove @type, type and model columns from device list table
Stephan Fortelny
committed
36ab7d6

Commits on May 1, 2018

WIP Display devices and lots coming from server (limit to 5 items for now)
Stephan Fortelny
committed
fb5f837
WIP Display items of parent resource by default
Stephan Fortelny
committed
6931bca
WIP filter items of parent resource id if present
Stephan Fortelny
committed
d7b4475
WIP fixed navigating between lots
Stephan Fortelny
committed
afe6e05
WIP Removed resource-list-selector-big.factory. Refactored resource-list-selector.factory into service to maintain selection when navigating between lots
Stephan Fortelny
committed
76e0618

Commits on May 2, 2018

WIP Re-enabled 'label' button (always set settings.rootAncestor to current resource)
Stephan Fortelny
committed
7125101
WIP Re-enabled 'certificate' button: 'label' modal does not work since it somehow calls the 'certificate' modal
Stephan Fortelny
committed
65ee41e
WIP Re-enabled 'Organize' button to add/remove selected devices to/from lot
Stephan Fortelny
committed
c9b4454
WIP Re-enabled 'Export' button
Stephan Fortelny
committed
06e9fa3
WIP Fixed 'label' button by enabling scopes for label and certificate buttons
Stephan Fortelny
committed
8687635
WIP Removed obsolete 'place' module
Stephan Fortelny
committed
09e6067

Commits on May 3, 2018

WIP Re-enabled Manual events button
Stephan Fortelny
committed
1c0ae68
stub for device content panel
Stephan Fortelny
committed
c3138b6
WIP (doesn't work yet) To avoid showing many lots in selection panel, show only currently selected lot with # of selected devices and lots with # of ORIGINALLY selected devices
Stephan Fortelny
committed
c6b0810

Commits on May 4, 2018

WIP (works now) To avoid showing many lots in selection panel, show only currently selected lot with # of selected devices and lots with # of ORIGINALLY selected devices
Stephan Fortelny
committed
fe8ffc5
WIP Refactor: Made resource list selector 'remove' and 'add' methods private and moved _control() up
Stephan Fortelny
committed
b294c30

Commits on May 9, 2018

added TODO
Stephan Fortelny
committed
2fc064d
WIP Formatting: Pills for selected lots
Stephan Fortelny
committed
eddc8be
WIP Display selection info
Stephan Fortelny
committed
0b0c29e
WIP Format selection summary
Stephan Fortelny
committed
f5ceafd
WIP Format selected folders
Stephan Fortelny
committed
8f19400

Commits on May 10, 2018

WIP Workaround to set labels of selected lots correctly. Necessary because API /devices doesn't include the 'label' property for device ancestors
Stephan Fortelny
committed
ec3084b
WIP Previous workaround: Added comments to explain workaround
Stephan Fortelny
committed
244f036
added workaround to shown only direct children devices of current lot
Stephan Fortelny
committed
3b15949
Fixed deselectAll
Stephan Fortelny
committed
833e692
WIP Show all (not only direct children) devices of current lot in table
Stephan Fortelny
committed
7c6e237
WIP Added comment with sample code to get lot labels
Stephan Fortelny
committed
0426323

Commits on May 11, 2018

WIP Renamed device.lots => device.parentLots
Stephan Fortelny
committed
75513c6
WIP Show all lots of selected devices
Stephan Fortelny
committed
cb8e4b0
WIP Workaround to fix selection in root
Stephan Fortelny
committed
a334ad6
WIP Cleanup
Stephan Fortelny
committed
0ccb67d
WIP Fixed select/deselect all button
Stephan Fortelny
committed
1c9395e
WIP Added stub for selected device summary detailed views
Stephan Fortelny
committed
2ea3fbe

Commits on May 14, 2018

WIP Selection details: Until now, component is implemented
Stephan Fortelny
committed
be2f2f6

Commits on May 17, 2018

WIP Selection details: Type
Stephan Fortelny
committed
ffaf262
WIP Improved back button in selection summary detail view panel
Stephan Fortelny
committed
19faf55
WIP Added show more selected lots button
Stephan Fortelny
committed
0ea7d58
WIP Selection details slide from right
Stephan Fortelny
committed
3a9d385
WIP Fixed price summary of selected device: allow nested properties
Stephan Fortelny
committed
767f6a9
WIP Added lot icons
Stephan Fortelny
committed
d6aee3a
WIP Set labels of device.lots to show them in selection panel
Stephan Fortelny
committed
24cb7cc
WIP Added show more button to lots
Stephan Fortelny
committed
fde8a93
WIP Selection panel occupies full height and 50% width
Stephan Fortelny
committed
a9b1ec1

Commits on May 21, 2018

WIP Enabled control and shift click for device selection
Stephan Fortelny
committed
b74aa6d
WIP Fixed infinite scroll for devices
Stephan Fortelny
committed
a9cc858
WIP Fixed selection of devices without lots/ancestors
Stephan Fortelny
committed
665986d

Commits on May 22, 2018

WIP Fixed simple (= without ctrl/shift key) selection
Stephan Fortelny
committed
55c8e22

Commits on May 23, 2018

WIP Visual improvements
Stephan Fortelny
committed
72c882b
WIP More visual improvements
Stephan Fortelny
committed
24fddae
WIP Improved visuals of breadcrumb
Stephan Fortelny
committed
8c86a8d
WIP Fixed Show-more-lots button and display of total devices and lots
Stephan Fortelny
committed
009b55b
WIP CSS+HTML for selection summary
Stephan Fortelny
committed
812a0a0

Commits on May 29, 2018

WIP Improved Selection summary status panel
Stephan Fortelny
committed
bb13b97
WIP Added condition-score and price, changed status to static information
Stephan Fortelny
committed
cd9a5cd

Commits on May 30, 2018

WIP Stubs for selection summary events
Stephan Fortelny
committed
a2e72fe
WIP Implemented button to show devices of events by adding new search parameter
Stephan Fortelny
committed
50e2519
WIP Fixed nested selection details
Stephan Fortelny
committed
43c633f
WIP View selected devices' events in table
Stephan Fortelny
committed
e8e10cd
WIP Added lots selection summary
Stephan Fortelny
committed
db00455
WIP Fixed viewport height
Stephan Fortelny
committed
8e017e3
WIP Pressing show more selected lots button display lots selection summary
Stephan Fortelny
committed
52b84b2

Commits on May 31, 2018

Removed creating any group except for lot: Removed all groups except lots from create dropdown menu
Stephan Fortelny
committed
6422d9b
Merge remote-tracking branch 'origin/devel' into devel
Stephan Fortelny
committed
023f08b
Merge branch 'devel' into v2b-simple-selection-and-selection-info-for-devices
Stephan Fortelny
committed
73153f6
Reenabled renaming of lot
Stephan Fortelny
committed
9dc39ae
Reduced calls to selector.getAllSelectedDevices by saving selected devices. removed selector from group-resource-button
Stephan Fortelny
committed
4f3146b
Fixed calls to selector.get...PropertyOfSelected
Stephan Fortelny
committed
327f18a
Add group-resource-button to breadcrumb to add/remove lot from other lots
Stephan Fortelny
committed
471c708
Sort children lots ascending
Stephan Fortelny
committed
36784bf

Commits on Jun 4, 2018

Fixed showing placeholders. Store all aggregated properties of selection to avoid calls to selector.getAggregatedXXX...
Stephan Fortelny
committed
174eecf
Fixed pricing info for selection
Stephan Fortelny
committed
973d592
Clean up + refactor of resource-list.directive (html + js)
Stephan Fortelny
committed
869df7b
Clean up resource-list-selector
Stephan Fortelny
committed
0026f04
Fixed selection (error from cleanup/refactor)
Stephan Fortelny
committed
6dae442
Removed console.log's
Stephan Fortelny
committed
dcb5ced
Fixed selection of already selected devices (still bug from cleanup/refactor)
Stephan Fortelny
committed
20171b0

Commits on Jun 5, 2018

Hover background color for devices and events tables
Stephan Fortelny
committed
a36c10e
When display an event's device go to inventory root
Stephan Fortelny
committed
06fba18
Improved display of selected lots and devices
Stephan Fortelny
committed
a20d553

Commits on Jun 6, 2018

Fixed unit tests
Stephan Fortelny
committed
5d3adaf
Merge pull request #21 from eReuse/v2b-simple-selection-and-selection-info-for-devices
Stephan
authored
c876413
Merge branch 'v2b-simple-selection-and-selection-info-for-devices' into devel
Stephan Fortelny
committed
9f7ccd2
Fixed display of components
Stephan Fortelny
committed
28c13a6
Fixed constants.js URL
Stephan Fortelny
committed
f8a85e6

Commits on Jun 7, 2018

WIP Responsive version. TODO Selection summary panel
Stephan Fortelny
committed
a5b56ae

Commits on Jun 8, 2018

Responsive version of selection summary panel
Stephan Fortelny
committed
d75d51b
Merge pull request #22 from eReuse/responsive-devicehub
Stephan
authored
791b837

Commits on Jun 14, 2018

Added deselect all selected devices button to selection panel
Stephan Fortelny
committed
0edb345

Commits on Jun 18, 2018

Resolución Issue Bug #188: al borrar los filtros, no puedo hacer scroll hacia abajo: https://tree.taiga.io/project/ereuseorg-devicehub/issue/188
Stephan Fortelny
committed
aefe960
Fixed issue bug #189: Aparece el "Show more" cuando no había ningún lote para mostrar. https://tree.taiga.io/project/ereuseorg-devicehub/issue/189
Stephan Fortelny
committed
9d2a0a6
WIP Filters: Removed obsolete filters
Stephan Fortelny
committed
32e5452
WIP Filters: Moved filters to devices
Stephan Fortelny
committed
88d74fb
Filters do not affect lots
Stephan Fortelny
committed
8fd37cb

Commits on Jun 21, 2018

Fix background and border of children lots buttons
Stephan Fortelny
committed
45ef754
Fixed show more children lots button
Stephan Fortelny
committed
cbcde81

Commits on Jun 22, 2018

Fixed: #197 Mejorar formato de los eventos https://tree.taiga.io/project/ereuseorg-devicehub/issue/197
Stephan Fortelny
committed
89ab69a
#194: Añadir € al precio (https://tree.taiga.io/project/ereuseorg-devicehub/issue/194)
Stephan Fortelny
committed
2814d89
Fix #190 número de serie sobresale (https://tree.taiga.io/project/ereuseorg-devicehub/issue/190): Added break-word word wrapping to selection details content
Stephan Fortelny
committed
2c4a83e
Fixed #178: Shared with me https://tree.taiga.io/project/ereuseorg-devicehub/issue/178
Stephan Fortelny
committed
754d856
#184: Organize => Edit lots (https://tree.taiga.io/project/ereuseorg-devicehub/issue/184)
Stephan Fortelny
committed
6369635
Merge branch 'master' of https://github.com/eReuse/DeviceHubClient
Stephan Fortelny
committed
308e2ec
Merge branch 'master' into devel
Stephan Fortelny
committed
dc05aec
Fixed server URL in CONSTANTS.js
Stephan Fortelny
committed
b7b36fd
Merge remote-tracking branch 'origin/v2b-simple-selection-and-selection-info-for-devices' into devel
Stephan Fortelny
committed
ac52ccf
#182: 'View device list' => 'Back to device list' (https://tree.taiga.io/project/ereuseorg-devicehub/issue/182)
Stephan Fortelny
committed
bd7799f

Commits on Sep 1, 2018

Removed white footer on sm-sized viewpoint (mobile): Removed footer height from fill height bar on sm-sized viewpoint
Stephan Fortelny
committed
82b600d