You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/10/05 15:22:26 UTC
[isis-app-demo] tag tags/05-03-schedule-visit-action created (now
1907f06)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to tag tags/05-03-schedule-visit-action
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git.
at 1907f06 (commit)
This tag includes the following new commits:
new aa793ad adds visits mixin collection for Pet
new fbf30e6 adds bookVisit mixin action for Pet
new 4d5bfbb adds layout file for Visit
new 392a964 adds png for Visit
new 1907f06 adds columnOrder for visits collection of Pet
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[isis-app-demo] 05/05: adds columnOrder for visits collection of Pet
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to tag tags/05-03-schedule-visit-action
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git
commit 1907f06db430e7314d4e09d608af823641a0a66b
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 5 16:17:04 2021 +0100
adds columnOrder for visits collection of Pet
---
.../main/java/petclinic/modules/pets/dom/pet/Pet#visits.columnOrder.txt | 2 ++
1 file changed, 2 insertions(+)
diff --git a/module-pets/src/main/java/petclinic/modules/pets/dom/pet/Pet#visits.columnOrder.txt b/module-pets/src/main/java/petclinic/modules/pets/dom/pet/Pet#visits.columnOrder.txt
new file mode 100644
index 0000000..a754662
--- /dev/null
+++ b/module-pets/src/main/java/petclinic/modules/pets/dom/pet/Pet#visits.columnOrder.txt
@@ -0,0 +1,2 @@
+visitAt
+reason
[isis-app-demo] 03/05: adds layout file for Visit
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to tag tags/05-03-schedule-visit-action
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git
commit 4d5bfbb9bca8583c2d7a2d437cb736e7651102b7
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 5 16:16:39 2021 +0100
adds layout file for Visit
---
.../modules/visits/dom/visit/Visit.layout.xml | 47 ++++++++++++++++++++++
1 file changed, 47 insertions(+)
diff --git a/module-visits/src/main/java/petclinic/modules/visits/dom/visit/Visit.layout.xml b/module-visits/src/main/java/petclinic/modules/visits/dom/visit/Visit.layout.xml
new file mode 100644
index 0000000..a1a39a3
--- /dev/null
+++ b/module-visits/src/main/java/petclinic/modules/visits/dom/visit/Visit.layout.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:lnk="h [...]
+ <bs3:row>
+ <bs3:col span="12" unreferencedActions="true">
+ <cpt:domainObject bookmarking="AS_ROOT"/>
+ </bs3:col>
+ </bs3:row>
+ <bs3:row>
+ <bs3:col span="6">
+ <bs3:row>
+ <bs3:col span="12">
+ <bs3:tabGroup>
+ <bs3:tab name="General">
+ <bs3:row>
+ <bs3:col span="12">
+ <cpt:fieldSet id="name"/>
+ </bs3:col>
+ </bs3:row>
+ </bs3:tab>
+ <bs3:tab name="Metadata">
+ <bs3:row>
+ <bs3:col span="12">
+ <cpt:fieldSet name="Metadata" id="metadata"/>
+ </bs3:col>
+ </bs3:row>
+ </bs3:tab>
+ <bs3:tab name="Other">
+ <bs3:row>
+ <bs3:col span="12">
+ <cpt:fieldSet name="Other" id="other" unreferencedProperties="true"/>
+ </bs3:col>
+ </bs3:row>
+ </bs3:tab>
+ </bs3:tabGroup>
+ <cpt:fieldSet id="details" name="Details"/>
+ </bs3:col>
+ </bs3:row>
+ <bs3:row>
+ <bs3:col span="12">
+ </bs3:col>
+ </bs3:row>
+ </bs3:col>
+ <bs3:col span="6">
+ <bs3:tabGroup unreferencedCollections="true"/>
+ </bs3:col>
+ </bs3:row>
+</bs3:grid>
[isis-app-demo] 04/05: adds png for Visit
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to tag tags/05-03-schedule-visit-action
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git
commit 392a964979a58f642f6f6a8d074861704245b007
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 5 16:16:53 2021 +0100
adds png for Visit
---
.../java/petclinic/modules/visits/dom/visit/Visit.png | Bin 0 -> 701 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/module-visits/src/main/java/petclinic/modules/visits/dom/visit/Visit.png b/module-visits/src/main/java/petclinic/modules/visits/dom/visit/Visit.png
new file mode 100644
index 0000000..e5311eb
Binary files /dev/null and b/module-visits/src/main/java/petclinic/modules/visits/dom/visit/Visit.png differ
[isis-app-demo] 02/05: adds bookVisit mixin action for Pet
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to tag tags/05-03-schedule-visit-action
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git
commit fbf30e6ccbedef39228e17c44c7606804296c29c
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 5 16:16:30 2021 +0100
adds bookVisit mixin action for Pet
---
.../visits/contributions/pet/Pet_bookVisit.java | 57 ++++++++++++++++++++++
1 file changed, 57 insertions(+)
diff --git a/module-visits/src/main/java/petclinic/modules/visits/contributions/pet/Pet_bookVisit.java b/module-visits/src/main/java/petclinic/modules/visits/contributions/pet/Pet_bookVisit.java
new file mode 100644
index 0000000..6d1146d
--- /dev/null
+++ b/module-visits/src/main/java/petclinic/modules/visits/contributions/pet/Pet_bookVisit.java
@@ -0,0 +1,57 @@
+package petclinic.modules.visits.contributions.pet;
+
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
+import org.apache.isis.applib.annotation.Publishing;
+import org.apache.isis.applib.annotation.SemanticsOf;
+import org.apache.isis.applib.services.clock.ClockService;
+import org.apache.isis.applib.services.repository.RepositoryService;
+
+import lombok.RequiredArgsConstructor;
+
+import petclinic.modules.pets.dom.pet.Pet;
+import petclinic.modules.pets.dom.pet.PetRepository;
+import petclinic.modules.pets.dom.pet.PetSpecies;
+import petclinic.modules.pets.dom.petowner.PetOwner;
+import petclinic.modules.pets.types.PetName;
+import petclinic.modules.visits.dom.visit.Visit;
+import petclinic.modules.visits.types.Reason;
+
+@Action(
+ semantics = SemanticsOf.IDEMPOTENT,
+ commandPublishing = Publishing.ENABLED,
+ executionPublishing = Publishing.ENABLED
+)
+@ActionLayout(associateWith = "visits", sequence = "1")
+@RequiredArgsConstructor
+public class Pet_bookVisit {
+
+ private final Pet pet;
+
+ public Visit act(
+ LocalDateTime visitAt,
+ @Reason final String reason
+ ) {
+ return repositoryService.persist(new Visit(pet, visitAt, reason));
+ }
+ public String validate0Act(LocalDateTime visitAt) {
+ return clockService.getClock().nowAsLocalDateTime().isBefore(visitAt)
+ ? null
+ : "Must be in the future";
+ }
+ public LocalDateTime default0Act() {
+ return clockService.getClock().nowAsLocalDateTime()
+ .toLocalDate()
+ .plusDays(1)
+ .atTime(LocalTime.of(9, 0));
+ }
+
+ @Inject ClockService clockService;
+ @Inject RepositoryService repositoryService;
+}
[isis-app-demo] 01/05: adds visits mixin collection for Pet
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to tag tags/05-03-schedule-visit-action
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git
commit aa793ad549e63704108c521db126df7835ecfeb8
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 5 16:16:15 2021 +0100
adds visits mixin collection for Pet
---
.../visits/contributions/pet/Pet_visits.java | 30 ++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/module-visits/src/main/java/petclinic/modules/visits/contributions/pet/Pet_visits.java b/module-visits/src/main/java/petclinic/modules/visits/contributions/pet/Pet_visits.java
new file mode 100644
index 0000000..36e9b7b
--- /dev/null
+++ b/module-visits/src/main/java/petclinic/modules/visits/contributions/pet/Pet_visits.java
@@ -0,0 +1,30 @@
+package petclinic.modules.visits.contributions.pet;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+import org.apache.isis.applib.annotation.Collection;
+import org.apache.isis.applib.annotation.CollectionLayout;
+
+import lombok.RequiredArgsConstructor;
+
+import petclinic.modules.pets.dom.pet.Pet;
+import petclinic.modules.pets.dom.pet.PetRepository;
+import petclinic.modules.pets.dom.petowner.PetOwner;
+import petclinic.modules.visits.dom.visit.Visit;
+import petclinic.modules.visits.dom.visit.VisitRepository;
+
+@Collection
+@CollectionLayout(defaultView = "table")
+@RequiredArgsConstructor
+public class Pet_visits {
+
+ private final Pet pet;
+
+ public List<Visit> coll() {
+ return visitRepository.findByPetOrderByVisitAtDesc(pet);
+ }
+
+ @Inject VisitRepository visitRepository;
+}