Skip to content

Commit

Permalink
Release/1.8.3 (#117)
Browse files Browse the repository at this point in the history
* prepare release 1.8.0-RC1

* Feature/money filter (#92)

* Replace concept nodes by concept lists (#88)

* Make concept lists the default node type, remove special handling

* Add code list resolution to demo data

* initial money range filter

* update moneyRange

* remove accounting
update yarn.lock

* update demo data

* update formatted value for money range

* fix decimal scale expect number

* fixed wrong result display position (#93)

* update money range

* fix type imports

* update demo data

* reset max-len in eslintrc.json

* Fix/new features from develop (#100)

* New query node editor layout (#96)

* Define QNE state and apply initial draft of the new layout

* Make node label editable

* Reorganize QueryNodeEditor component

* Make node label changeable in forms

* Embed QueryNodeEditor directly into RightPane

* Fix styles and cleanup

* Reset QueryNodeModal state when closing

* Add filter icon, improve style compatibility

* Update Filter label text

* Remove hasActiveFilters property from query nodes

* Make concept lists editable

* WIP

* Cleanup

* Fix QueryGroupModal styles

* More cleanup

* Fix formatting

* Query Node Editor fixes (#97)

* QueryNodeEditor related fixes

* Fix FormQueryNodeEditor being recreated on every edit

* Money range fixes (#98)

* Add some fixes for the money range input

* Reset formattedValue when switching range filter modes

* Fix indentation

* prepare release 1.8.0-RC2

* Fix clear value button layout in ClearableInput

* Fix check for already existing concepts
... when dragging a concept from the tree into the query node editor

* Align labels used for opening the QueryNodeEditor

* prepare release 1.8.0-RC4

* Tree Search (#103)

* - Create a search box at the top of the category tree view
- Implement filter function as part of a reducer

* fix: missing clear value button in input
refactoring

* fix: check undefined

* - changes
- prepare async

* regex search

* set search?: SearchType optional

* refactoring

* changes

* trailing spaces removed

* fuzzyMatch commented out

* fix import

* refactoring

* update flow version to 0.69.0

* replace searchbox mode with isMulti

* add flow

* changes

*  imports organized

* WIP: searching with js worker

* update concept search

* Update CategoryTreeNode.js

set SearchType optional

* SEARCH_API: indexing only values

* show result state in bottom of search input

* refactoring

* Update CategoryTree.js

* Update package.json

Downgrade flow-bin

* update yarn.lock

* clearable searchbox
placeholder color
fix loading

* removed deplay input
searchbox style

* add deplay input
refactoring

* searching in backend integrated, refactoring

* search to simulate api added

* SearchApi removed

* fix initial state

* refactoring

* refactoring

* search fix empty result

* return value of search api changed

* prepare release 1.8.0-RC6

* fix searching

* update .gitignore

* prepare release 1.8.0-RC7

* refactoring

* fix "could not find node" after expand query

* prepare release 1.8.0-rc.10

* prepare release 1.8.0-rc.10

* update downloadResults label

* fix moment locale

* Feature/additional info scroll (#113)

* demo data extended

* tooltip scroll changes

* tooltip scrollbar hide but still scrolling

* fix TypeError e.suggestions[n] is undefined

* create pre release 1.8.0-rc.11-pre

* prepare release 1.8.0-rc.12

* fix: TypeError: Cannot read property '0' of undefined

* prepare release 1.8.0-rc.14

* prepare release 1.8.0-rc.14

* prepare release 1.8.0

* fix exit code 127

* fix exit code 127

* fix convert float to factor value
  • Loading branch information
MarcusBaitz committed Jun 6, 2018
1 parent ed8a929 commit 7acab2a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
4 changes: 3 additions & 1 deletion frontend/lib/js/form-components/ClearableInput.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ const ClearableInput = (props: PropsType) => {
type={props.inputType}
onValueChange={(values: NumberFormatValueType) => {
const { formattedValue, floatValue } = values;
props.onChange(floatValue * (T.translate('moneyRange.factor') || 1), formattedValue);
const parsed = Math.round(floatValue * (T.translate('moneyRange.factor') || 1))

props.onChange(parsed, formattedValue);
}}
value={props.formattedValue}
{...props.inputProps}
Expand Down
6 changes: 3 additions & 3 deletions frontend/lib/js/form-components/InputRange.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ const InputRange = (props: PropsType) => {

const factor = T.translate('moneyRange.factor') || 1;
const minFormattedValue =
(formattedValue && formattedValue.min) || (parseInt(minValue) / factor) || null;
(formattedValue && formattedValue.min) || (Math.round(minValue) / factor) || null;
const maxFormattedValue =
(formattedValue && formattedValue.max) || (parseInt(maxValue) / factor) || null;
(formattedValue && formattedValue.max) || (Math.round(maxValue) / factor) || null;
const exactFormattedValue =
(formattedValue && formattedValue.exact) || (parseInt(exactValue) / factor) || null;
(formattedValue && formattedValue.exact) || (Math.round(exactValue) / factor) || null;

const isRangeMode = props.mode === 'range';
const inputProps = {
Expand Down

0 comments on commit 7acab2a

Please sign in to comment.