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 intousody2018-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

Commits on Apr 13, 2018

WIP Cleaning up resource view, list, etc.
Stephan Fortelny
committed
WIP Cleaning up resource view, list, etc.
Stephan Fortelny
committed

Commits on Apr 16, 2018

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

Commits on Apr 20, 2018

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

Commits on Apr 23, 2018

Merge branch 'v1-easy-changes' into merge
Stephan Fortelny
committed
Revert CONSTANTS to use local server
Stephan Fortelny
committed
Merge branch 'merge' into prepare-for-redesign
Stephan Fortelny
committed
Merge branch 'v1-easy-changes' into prepare-for-redesign
Stephan Fortelny
committed
Merge branch 'v1-easy-changes' into prepare-for-redesign
Stephan Fortelny
committed
Readded select all button to item list
Stephan Fortelny
committed
Simplified organize button to only show buttons to add or remove from lot
Stephan Fortelny
committed
Info shown in right panel depends on selected items and type of items
Stephan Fortelny
committed
Stubs for summary of lot/selected items in right panel
Stephan Fortelny
committed
Remove number of selected items in certificate button
Stephan Fortelny
committed
Inline buttons manipulating selected items directly in resource list directive and remove screener
Stephan Fortelny
committed

Commits on Apr 25, 2018

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

Commits on Apr 26, 2018

Commits on Apr 27, 2018

Commits on May 1, 2018

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

Commits on May 2, 2018

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

Commits on May 3, 2018

WIP Re-enabled Manual events button
Stephan Fortelny
committed
stub for device content panel
Stephan Fortelny
committed
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

Commits on May 4, 2018

Commits on May 9, 2018

added TODO
Stephan Fortelny
committed
WIP Formatting: Pills for selected lots
Stephan Fortelny
committed
WIP Display selection info
Stephan Fortelny
committed
WIP Format selection summary
Stephan Fortelny
committed
WIP Format selected folders
Stephan Fortelny
committed

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
WIP Previous workaround: Added comments to explain workaround
Stephan Fortelny
committed
added workaround to shown only direct children devices of current lot
Stephan Fortelny
committed
Fixed deselectAll
Stephan Fortelny
committed
WIP Show all (not only direct children) devices of current lot in table
Stephan Fortelny
committed
WIP Added comment with sample code to get lot labels
Stephan Fortelny
committed

Commits on May 11, 2018

WIP Renamed device.lots => device.parentLots
Stephan Fortelny
committed
WIP Show all lots of selected devices
Stephan Fortelny
committed
WIP Workaround to fix selection in root
Stephan Fortelny
committed
WIP Cleanup
Stephan Fortelny
committed
WIP Fixed select/deselect all button
Stephan Fortelny
committed
WIP Added stub for selected device summary detailed views
Stephan Fortelny
committed

Commits on May 14, 2018

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

Commits on May 17, 2018

WIP Selection details: Type
Stephan Fortelny
committed
WIP Improved back button in selection summary detail view panel
Stephan Fortelny
committed
WIP Added show more selected lots button
Stephan Fortelny
committed
WIP Selection details slide from right
Stephan Fortelny
committed
WIP Fixed price summary of selected device: allow nested properties
Stephan Fortelny
committed
WIP Added lot icons
Stephan Fortelny
committed
WIP Set labels of device.lots to show them in selection panel
Stephan Fortelny
committed
WIP Added show more button to lots
Stephan Fortelny
committed
WIP Selection panel occupies full height and 50% width
Stephan Fortelny
committed

Commits on May 21, 2018

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

Commits on May 22, 2018

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

Commits on May 23, 2018

WIP Visual improvements
Stephan Fortelny
committed
WIP More visual improvements
Stephan Fortelny
committed
WIP Improved visuals of breadcrumb
Stephan Fortelny
committed
WIP Fixed Show-more-lots button and display of total devices and lots
Stephan Fortelny
committed
WIP CSS+HTML for selection summary
Stephan Fortelny
committed

Commits on May 29, 2018

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

Commits on May 30, 2018

WIP Stubs for selection summary events
Stephan Fortelny
committed
WIP Implemented button to show devices of events by adding new search parameter
Stephan Fortelny
committed
WIP Fixed nested selection details
Stephan Fortelny
committed
WIP View selected devices' events in table
Stephan Fortelny
committed
WIP Added lots selection summary
Stephan Fortelny
committed
WIP Fixed viewport height
Stephan Fortelny
committed
WIP Pressing show more selected lots button display lots selection summary
Stephan Fortelny
committed

Commits on May 31, 2018

Removed creating any group except for lot: Removed all groups except lots from create dropdown menu
Stephan Fortelny
committed
Merge remote-tracking branch 'origin/devel' into devel
Stephan Fortelny
committed
Merge branch 'devel' into v2b-simple-selection-and-selection-info-for-devices
Stephan Fortelny
committed
Reenabled renaming of lot
Stephan Fortelny
committed
Reduced calls to selector.getAllSelectedDevices by saving selected devices. removed selector from group-resource-button
Stephan Fortelny
committed
Fixed calls to selector.get...PropertyOfSelected
Stephan Fortelny
committed
Add group-resource-button to breadcrumb to add/remove lot from other lots
Stephan Fortelny
committed
Sort children lots ascending
Stephan Fortelny
committed

Commits on Jun 4, 2018

Fixed showing placeholders. Store all aggregated properties of selection to avoid calls to selector.getAggregatedXXX...
Stephan Fortelny
committed
Fixed pricing info for selection
Stephan Fortelny
committed
Clean up + refactor of resource-list.directive (html + js)
Stephan Fortelny
committed
Clean up resource-list-selector
Stephan Fortelny
committed
Fixed selection (error from cleanup/refactor)
Stephan Fortelny
committed
Removed console.log's
Stephan Fortelny
committed
Fixed selection of already selected devices (still bug from cleanup/refactor)
Stephan Fortelny
committed

Commits on Jun 5, 2018

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

Commits on Jun 6, 2018

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

Commits on Jun 7, 2018

WIP Responsive version. TODO Selection summary panel
Stephan Fortelny
committed

Commits on Jun 8, 2018

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

Commits on Jun 14, 2018

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

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
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
WIP Filters: Removed obsolete filters
Stephan Fortelny
committed
WIP Filters: Moved filters to devices
Stephan Fortelny
committed
Filters do not affect lots
Stephan Fortelny
committed

Commits on Jun 21, 2018

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

Commits on Jun 22, 2018

Fixed: #197 Mejorar formato de los eventos https://tree.taiga.io/project/ereuseorg-devicehub/issue/197
Stephan Fortelny
committed
#194: Añadir € al precio (https://tree.taiga.io/project/ereuseorg-devicehub/issue/194)
Stephan Fortelny
committed
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
Fixed #178: Shared with me https://tree.taiga.io/project/ereuseorg-devicehub/issue/178
Stephan Fortelny
committed
#184: Organize => Edit lots (https://tree.taiga.io/project/ereuseorg-devicehub/issue/184)
Stephan Fortelny
committed
Merge branch 'master' of https://github.com/eReuse/DeviceHubClient
Stephan Fortelny
committed
Merge branch 'master' into devel
Stephan Fortelny
committed
Fixed server URL in CONSTANTS.js
Stephan Fortelny
committed
Merge remote-tracking branch 'origin/v2b-simple-selection-and-selection-info-for-devices' into devel
Stephan Fortelny
committed
#182: 'View device list' => 'Back to device list' (https://tree.taiga.io/project/ereuseorg-devicehub/issue/182)
Stephan Fortelny
committed

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