# HG changeset patch # User Thomas Junk # Date 1552044282 -3600 # Node ID 91c68153e7b62aed03d5051c388de0e90677f599 # Parent 5b3d778db00c7122b8c1eb7311e66d490ae85e33 staging: switch route to new design per default diff -r 5b3d778db00c -r 91c68153e7b6 client/src/components/Contextbox.vue --- a/client/src/components/Contextbox.vue Fri Mar 08 11:27:29 2019 +0100 +++ b/client/src/components/Contextbox.vue Fri Mar 08 12:24:42 2019 +0100 @@ -36,7 +36,7 @@ ImportOverview: () => import("@/components/importoverview/ImportOverview.vue"), ImportOverviewAlt: () => - import("@/components/importoverview/ImportOverviewAlt.vue") + import("@/components/importoverview/ImportOverview_blue.vue") }, computed: { ...mapState("application", [ diff -r 5b3d778db00c -r 91c68153e7b6 client/src/components/importoverview/ImportOverview.vue --- a/client/src/components/importoverview/ImportOverview.vue Fri Mar 08 11:27:29 2019 +0100 +++ b/client/src/components/importoverview/ImportOverview.vue Fri Mar 08 12:24:42 2019 +0100 @@ -5,61 +5,263 @@ title="Staging Area" :closeCallback="$parent.close" /> -
- -
-
- - - - -
-
- Review -
- Nothing to review +
+
+
 
+
Id
+
Kind
+
+ Date +
+
+ Imported +
+
User
+
State
+
 
-
-
-
- - - -
-
- Logs -
+
+
+
+
+ + +
+
{{ entry.id }}
+
+ {{ entry.kind.toUpperCase() }} +
+
+ {{ entry.summary.date | surveyDate }} +
+
+ {{ entry.enqueued.split("T")[0] | surveyDate }} +
+
{{ entry.user }}
+
+ {{ entry.state }} +
+
+ + + + +
+
+
+
+
+ + + Additional Info +
+
+
+ + + {{ result["fk-gauge-id"] }} + ( New ) + {{ result["fk-gauge-id"] }} + {{ + result["measure-date"] | datetime + }} +
+
+
+
+ Value +
+
+ Old +
+
+ New +
+
+
+
+ {{ entry }} +
+
+ {{ result.versions[0][entry] }} +
+
+ {{ result.versions[1][entry] }} +
+
+
+
+
+
+
+
+
+ + + Logs +
+
+
+ {{ logentry.kind.toUpperCase() }} + {{ logentry.time }} + {{ logentry.message }} +
+
+
+
+
+
@@ -67,53 +269,97 @@ diff -r 5b3d778db00c -r 91c68153e7b6 client/src/components/importoverview/ImportOverviewAlt.vue --- a/client/src/components/importoverview/ImportOverviewAlt.vue Fri Mar 08 11:27:29 2019 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,445 +0,0 @@ - - - - - diff -r 5b3d778db00c -r 91c68153e7b6 client/src/components/importoverview/ImportOverview_blue.vue --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/src/components/importoverview/ImportOverview_blue.vue Fri Mar 08 12:24:42 2019 +0100 @@ -0,0 +1,152 @@ + + + + +