Date Value #35

tobiasschweizer · 2020-02-26T08:35:21Z

closes #11

# Conflicts: # package-lock.json # package.json # projects/knora-ui/src/lib/viewer/operations/display-edit/display-edit.component.html # projects/knora-ui/src/lib/viewer/viewer.module.ts # src/app/app.component.ts

mdelez · 2020-04-03T10:09:22Z

since you moved the jdn-datepicker to the values folder, can you remove it from the time component since it's redundant now please? Also fix the import in the time-input.component :)

tobiasschweizer · 2020-04-03T10:10:25Z

since you moved the jdn-datepicker to the values folder, can you remove it from the time component since it's redundant now please? Also fix the import in the time-input.component :)

will do!

tobiasschweizer · 2020-04-03T11:31:06Z

note to myself: take a look at Guide: Material's component harnesses in your tests and Harness Overview.

# Conflicts: # projects/knora-ui/src/lib/viewer/operations/display-edit/display-edit.component.html # projects/knora-ui/src/lib/viewer/values/time-value/time-input/time-input.component.html # projects/knora-ui/src/lib/viewer/viewer.module.ts # src/app/app.component.html # src/app/app.component.ts

tobiasschweizer · 2020-04-06T15:04:02Z

since you moved the jdn-datepicker to the values folder, can you remove it from the time component since it's redundant now please? Also fix the import in the time-input.component :)

done in 87462a5

tobiasschweizer · 2020-04-06T15:38:22Z

@mdelez Could you please look at def47c9 and 333b776 to see if these changes are correct?

…alendar in a period

…before end in a period

mdelez · 2020-04-07T07:56:39Z

https://github.com/dasch-swiss/knora-ui-ng-lib/blob/720106f54b75c9af94ee8b55d3379b9862defa44/projects/knora-ui/src/lib/viewer/values/date-value/date-input/date-input.component.html#L1

the class name should be adapted to "date-input-container"

That's all I could find, it looks good otherwise! Of course, the css will need to be worked on but that can be another PR once you finish all the logic.

tobiasschweizer · 2020-04-07T07:58:25Z

https://github.com/dasch-swiss/knora-ui-ng-lib/blob/720106f54b75c9af94ee8b55d3379b9862defa44/projects/knora-ui/src/lib/viewer/values/date-value/date-input/date-input.component.html#L1

the class name should be adapted to "date-input-container"

That's all I could find, it looks good otherwise! Of course, the css will need to be worked on but that can be another PR once you finish all the logic.

good catch, done in b243a4b

mdelez · 2020-04-07T08:23:16Z

projects/knora-ui/src/lib/viewer/values/date-value/calendar-header/calendar-header.component.ts

+
+@Component({
+  selector: 'kui-calendar-header',
+  template: `


I think you should move this to the template file to keep it consistent with the way we've been creating all the other components

done in d7e2127

mdelez · 2020-04-07T08:25:39Z

projects/knora-ui/src/lib/viewer/values/date-value/date-input/date-input.component.html

+        Start date is <strong>required</strong>
+      </mat-error>
+      <mat-error *ngIf="startDateControl.hasError('sameCalendarRequired')">
+        In a period, start and end date must have the same <strong>calendar</strong>


change wording from "must have" to "must use" for a clearer error message

done in ec7687d

mdelez · 2020-04-07T08:33:59Z

projects/knora-ui/src/lib/viewer/values/date-value/date-input/date-input.component.ts

+   *
+   * @param date the given KnoraDate.
+   */
+  createCalendarDate(date: KnoraDate): GregorianCalendarDate | JulianCalendarDate {


What do you think about moving this logic to the js-lib inside a ConvertUtil or CalendarUtil class? Might be nice to have in case we need to convert from a KnoraDate somewhere else.

That's an excellent idea. I created https://dasch.myjetbrains.com/youtrack/issue/DSP-139.

mdelez · 2020-04-07T08:48:27Z

projects/knora-ui/src/lib/viewer/values/date-value/date-value.component.ts

+import {DateInputComponent} from "./date-input/date-input.component";
+
+/** Error when invalid control is dirty, touched, or submitted. */
+export class IntervalErrorStateMatcher implements ErrorStateMatcher {


class name should be adapted to "DateErrorStateMatcher"

done in f5d7a65

mdelez · 2020-04-07T08:50:09Z

projects/knora-ui/src/lib/viewer/values/date-value/date-value.component.ts

+
+  valueChangesSubscription: Subscription;
+
+  // TODO: check that both dates have the same calendar in case of a KnoraPeriod


is this TODO still relevant? I believe you're checking for the calendar consistency in time-input.component.ts

done in f5d7a65

# Conflicts: # projects/knora-ui/src/lib/viewer/operations/display-edit/display-edit.component.spec.ts # projects/knora-ui/src/lib/viewer/operations/display-edit/display-edit.component.ts

tobiasschweizer · 2020-04-08T06:34:42Z

@mdelez I will have a look at Angular Material Harness (#35 (comment)) to see if this simplifies the access to the HTML elements when using Material Components.

Edit: Often I find myself copying and pasting code from the Material repo to make the tests work because they involve complex async logic, and I think that's unnecessary because we don't want to duplicate their tests for our components.

I created https://dasch.myjetbrains.com/youtrack/issue/DSP-140 and https://dasch.myjetbrains.com/youtrack/issue/DSP-141.

tobiasschweizer · 2020-04-08T07:47:54Z

@mdelez Thanks, I will merge as soon as the tests have passed. Found a small typo in the specs ...

Tobias Schweizer added 30 commits February 25, 2020 13:28

feature (value): add component for date value

3c9b4cc

feature (value): add component for date input

6d6f3d2

feature (value): write updated date to Knora

9329685

feature (value): handle single dates and periods correctly

fc97275

feature (value): try to determine active calendar dynamically

f304cda

feature (value): set active calendar via directive (ongoing)

051e989

feature (values): add calendar header

2752ae1

refactor (values): rename variable

3e3cd54

Merge branch 'master' into wip/11-date-value

0f6c620

# Conflicts: # package-lock.json # package.json # projects/knora-ui/src/lib/viewer/operations/display-edit/display-edit.component.html # projects/knora-ui/src/lib/viewer/viewer.module.ts # src/app/app.component.ts

refactor (value): unify use of jdndatepicker directive

b8463c3

refactor (value): unify use of jdndatepicker directive

95348f2

test (value): add test component for date

1f1b847

chore (package.json): use new version of date adapter

9d55821

test (value): add test calendar header

5f603d8

test (value): add test calendar header

9228f68

test (value): add test calendar header

ced59d5

test (value): add test calendar header

82f395a

test (value): add test calendar header

fe26c80

feature (values): handle calendar initialization

00b5cfb

test (value): specs for jdn datepicker directive

867cecb

test (value): specs for jdn datepicker directive

e8704fc

test (value): specs for date input component

15d6d09

test (value): specs for date value component

da95792

feature (values): override standardValidatorFunc for dates

4c7676d

feature (values): populate update and creation value

5c517e7

tests (values): add test for date value component

3f90159

tests (values): add test for date value component

a4ff803

tests (values): add test for date value component

83c3766

tests (values): add test for date value component

7496acb

tests (values): add test for date value component

afdba7f

Tobias Schweizer added 2 commits April 6, 2020 16:58

fix (value): remove obsolete file

87462a5

Tobias Schweizer added 2 commits April 6, 2020 17:26

feature (value): adapt date to common value comp. structure

def47c9

tests (value): adapt tests for date comp. comment

333b776

Tobias Schweizer added 4 commits April 7, 2020 09:17

refactor (value): define validator for date input to check for same c…

dabcc2e

…alendar in a period

refactor (value): define validator for date input to check for start …

7f20d79

…before end in a period

tests (value): adapt assertions for date input comp. comment

0bee998

fix (value): remove <br> in date value comp. template

720106f

tobiasschweizer requested a review from mdelez April 7, 2020 07:54

fix (value): fix class name in date input comp. template

b243a4b

mdelez requested changes Apr 7, 2020

View reviewed changes

tobiasschweizer mentioned this pull request Apr 7, 2020

Prototyping property viewer with the value components #42

Merged

Tobias Schweizer added 4 commits April 8, 2020 08:11

Merge branch 'master' into wip/11-date-value

3a343dd

# Conflicts: # projects/knora-ui/src/lib/viewer/operations/display-edit/display-edit.component.spec.ts # projects/knora-ui/src/lib/viewer/operations/display-edit/display-edit.component.ts

refactor (value): move calendar header HTML to template file

d7e2127

refactor (value): provide better error message for date input comp.

ec7687d

refactor (value): small adaptions in date value comp.

f5d7a65

tobiasschweizer requested a review from mdelez April 8, 2020 06:34

mdelez approved these changes Apr 8, 2020

View reviewed changes

tests (value): small adaption in date value spec

6117cdd

tobiasschweizer merged commit 744d852 into master Apr 8, 2020

tobiasschweizer deleted the wip/11-date-value branch April 8, 2020 07:50

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Date Value #35

Date Value #35

tobiasschweizer commented Feb 26, 2020

mdelez commented Apr 3, 2020

tobiasschweizer commented Apr 3, 2020

tobiasschweizer commented Apr 3, 2020 •

edited

tobiasschweizer commented Apr 6, 2020

tobiasschweizer commented Apr 6, 2020

mdelez commented Apr 7, 2020

tobiasschweizer commented Apr 7, 2020

mdelez Apr 7, 2020

tobiasschweizer Apr 8, 2020

mdelez Apr 7, 2020

tobiasschweizer Apr 8, 2020

mdelez Apr 7, 2020

tobiasschweizer Apr 8, 2020

mdelez Apr 7, 2020

tobiasschweizer Apr 8, 2020

mdelez Apr 7, 2020

tobiasschweizer Apr 8, 2020

tobiasschweizer commented Apr 8, 2020 •

edited

tobiasschweizer commented Apr 8, 2020


		valueChangesSubscription: Subscription;

		// TODO: check that both dates have the same calendar in case of a KnoraPeriod

Date Value #35

Date Value #35

Conversation

tobiasschweizer commented Feb 26, 2020

mdelez commented Apr 3, 2020

tobiasschweizer commented Apr 3, 2020

tobiasschweizer commented Apr 3, 2020 • edited

tobiasschweizer commented Apr 6, 2020

tobiasschweizer commented Apr 6, 2020

mdelez commented Apr 7, 2020

tobiasschweizer commented Apr 7, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tobiasschweizer commented Apr 8, 2020 • edited

tobiasschweizer commented Apr 8, 2020

tobiasschweizer commented Apr 3, 2020 •

edited

tobiasschweizer commented Apr 8, 2020 •

edited