Merge pull request #12 from capire/flows

feat: status-transition flows

Author: sjvans

.cdsrc.json

@@ -0,0 +1,7 @@
+{
+  "[flow]": {
+    "folders": {
+      "flow": "xmpls/flow/"
+    }
+  }
+}

_i18n/i18n_en.properties

@@ -3,6 +3,7 @@ Agency=Agency
 AgencyName=Agency Name
 AvgPrice=Average Price
 BeginDate=Starting Date
+BlockTravel=Block Travel
 Booking=Booking
 BookingDate=Booking Date
 BookingDetails=Booking Details
@@ -36,6 +37,8 @@ Prices=Prices
 ProductID=Product
 ProductPrice=Product Price
 RejectTravel=Reject Travel
+ReopenTravel=Reopen Travel
+ReviewTravel=Review Travel
 Status=Status
 Street=Street
 Title=Title
@@ -45,4 +48,5 @@ Travel=Travel
 TravelAgency=Travel Agency
 Travels=Travels
 TravelStatus=Travel Status
+UnblockTravel=Unblock Travel
 WebAddress=Web Address

app/labels.cds

@@ -27,8 +27,10 @@ annotate schema.TravelStatus {
     @Common.Text: name
     @UI.ValueCriticality: [
       { Criticality: 3, Value: 'A', },
-      { Criticality: 2, Value: 'O',  },
-      { Criticality: 1, Value: 'X',  }
+      { Criticality: 2, Value: 'O', },
+      { Criticality: 2, Value: 'P', },
+      { Criticality: 1, Value: 'B', },
+      { Criticality: 1, Value: 'X', }
     ]
 }
 
@@ -74,6 +76,15 @@ annotate schema.Passengers with @title: '{i18n>Passenger}' {
 }
 
 
+using { TravelService } from '../srv/travel-service';
+
+annotate TravelService.Travels with actions {
+  rejectTravel    @title: '{i18n>RejectTravel}';
+  acceptTravel    @title: '{i18n>AcceptTravel}';
+  deductDiscount  @title: '{i18n>DeductDiscount}';
+};
+
+
 using sap.capire.flights.data;
 
 annotate data.Airlines with @title: '{i18n>Airline}' {

app/travels/field-control.cds

@@ -24,21 +24,11 @@ annotate TravelService.Travels with @(Common : {
   EndDate     @Common.FieldControl  : Status.fieldControl;
   Agency      @Common.FieldControl  : Status.fieldControl;
   Customer    @Common.FieldControl  : Status.fieldControl;
-
 } actions {
-  rejectTravel @(
-    Core.OperationAvailable : ( $self.Status.code != #Canceled ), // FIXME: wrong error in editor
-    Common.SideEffects.TargetProperties : ['in/Status/code','in/Status_code'],
-  );
-  acceptTravel @(
-    Core.OperationAvailable : ( $self.Status.code != #Accepted ), // FIXME: wrong error in editor
-    Common.SideEffects.TargetProperties : ['in/Status/code','in/Status_code'],
-  );
   deductDiscount @(
-    Core.OperationAvailable : ( $self.Status.code == #Open ),
     Common.SideEffects.TargetProperties : ['in/TotalPrice', 'in/BookingFee'],
   );
-}
+};
 
 annotate TravelService.Travels @Common.SideEffects#ReactonItemCreationOrDeletion : {
   SourceEntities : [ Bookings ],

app/travels/layouts.cds

@@ -7,9 +7,7 @@ using { TravelService } from '../../srv/travel-service';
 annotate TravelService.Travels with @UI : {
 
   Identification : [
-    { $Type  : 'UI.DataFieldForAction', Action : 'TravelService.acceptTravel',   Label  : '{i18n>AcceptTravel}'   },
-    { $Type  : 'UI.DataFieldForAction', Action : 'TravelService.rejectTravel',   Label  : '{i18n>RejectTravel}'   },
-    { $Type  : 'UI.DataFieldForAction', Action : 'TravelService.deductDiscount', Label  : '{i18n>DeductDiscount}' }
+    { $Type  : 'UI.DataFieldForAction', Action : 'TravelService.deductDiscount', Label  : '{i18n>DeductDiscount}' },
   ],
 
   HeaderInfo : {
@@ -34,9 +32,6 @@ annotate TravelService.Travels with @UI : {
   ],
 
   LineItem : [
-
-    { $Type  : 'UI.DataFieldForAction', Action : 'TravelService.acceptTravel',   Label  : '{i18n>AcceptTravel}'   },
-    { $Type  : 'UI.DataFieldForAction', Action : 'TravelService.rejectTravel',   Label  : '{i18n>RejectTravel}'   },
     { $Type  : 'UI.DataFieldForAction', Action : 'TravelService.deductDiscount', Label  : '{i18n>DeductDiscount}' },
 
     { Value : ID,            @UI.Importance : #High },
@@ -50,8 +45,8 @@ annotate TravelService.Travels with @UI : {
     { Value : (Status.code),
       Criticality : (
         Status.code == #Accepted ? 3 :
-        Status.code == #Open ? 2 :
-        Status.code == #Canceled ? 1 : 0
+        Status.code == #Open OR Status.code == #InReview ? 2 :
+        Status.code == #Canceled OR Status.code == #Blocked ? 1 : 0
       ),
       @UI.Importance : #High,
       @HTML5.CssDefaults: {width:'10em'}
@@ -74,8 +69,8 @@ annotate TravelService.Travels with @UI : {
     { Value : (Status.code),
       Criticality : (
         Status.code == #Accepted ? 3 :
-        Status.code == #Open ? 2 :
-        Status.code == #Canceled ? 1 : 0
+        Status.code == #Open OR Status.code == #InReview ? 2 :
+        Status.code == #Canceled OR Status.code == #Blocked ? 1 : 0
       ),
     },
     { Value : BeginDate },

db/data/sap.capire.travels-TravelStatus.csv

@@ -1,4 +1,6 @@
 code;name
 O;Open
+P;InReview
+B;Blocked
 A;Accepted
 X;Canceled