# HG changeset patch # User Sascha L. Teichmann # Date 1561972137 -7200 # Node ID 57c8cfff4920776ae68510c2ba7633e3e275e3a4 # Parent 545304d3ff936f57ee2b9734fd7e24e2e411efa3# Parent fd6d62b08af78b2838c29db1477a9b3b484a29c6 Merged default into simplify-sounding-results branch. diff -r 545304d3ff93 -r 57c8cfff4920 .hgtags --- a/.hgtags Mon Jul 01 11:08:19 2019 +0200 +++ b/.hgtags Mon Jul 01 11:08:57 2019 +0200 @@ -7,3 +7,4 @@ 4d69b79e9df6e2b646ac60f75f6655bb3c64f6c6 v2.1.0 4d7b481e1d392cd68c48a4ad19fc2865110e724e v3-uat2 d4a5d11e23a043026a747c626d133b45047d17df v3 +ad93adaeb68827534b1b3dd96c50096b3fa9a24c v3.1-preview20190626 diff -r 545304d3ff93 -r 57c8cfff4920 client/src/components/importconfiguration/ScheduledImports.vue --- a/client/src/components/importconfiguration/ScheduledImports.vue Mon Jul 01 11:08:19 2019 +0200 +++ b/client/src/components/importconfiguration/ScheduledImports.vue Mon Jul 01 11:08:57 2019 +0200 @@ -818,6 +818,8 @@ data["depth"] = this.depth * 1; data["source-organization"] = this.sourceOrganization; } + if (this.waitRetry) data["wait-retry"] = this.waitRetry; + if (this.trys) data["trys"] = Number(this.trys); data["send-email"] = this.eMailNotification; this.triggerActive = false; this.$store diff -r 545304d3ff93 -r 57c8cfff4920 client/src/components/importoverview/AGMLogItem.vue --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/src/components/importoverview/AGMLogItem.vue Mon Jul 01 11:08:57 2019 +0200 @@ -0,0 +1,113 @@ + + + + + diff -r 545304d3ff93 -r 57c8cfff4920 client/src/components/importoverview/ApprovedGaugeMeasurementDetail.vue --- a/client/src/components/importoverview/ApprovedGaugeMeasurementDetail.vue Mon Jul 01 11:08:19 2019 +0200 +++ b/client/src/components/importoverview/ApprovedGaugeMeasurementDetail.vue Mon Jul 01 11:08:57 2019 +0200 @@ -6,58 +6,17 @@ split: showLogs }" > -

- -

- {{ result["fk-gauge-id"] }} - ^{- (New)
-} -

- Value -

- Old -

- New -

- {{ entry }} -

- {{ result.versions[0][entry] }} -

- {{ result.versions[1][entry] }} -

+ + + @@ -107,6 +66,7 @@ * Thomas Junk */ import { mapState } from "vuex"; +import virtualList from "vue-virtual-scroll-list"; export default { data() { @@ -114,28 +74,33 @@ showDiff: 0 // open first item by default }; }, + components: { + "virtual-list": virtualList, + Item: () => import("./AGMLogItem") + }, computed: { - ...mapState("imports", ["showLogs", "details"]) + ...mapState("imports", ["showLogs", "details"]), + scrollistConfig() { + const smallLayout = { + size: 10, + remain: 20 + }; + const largeLayout = { + size: 12, + remain: 22 + }; + if (this.showAdditional) return smallLayout; + return largeLayout; + } }, methods: { toggleDiff(number) { + console.log(number); if (this.showDiff !== number) { this.showDiff = number; } else { this.showDiff = false; } - }, - isNew(result) { - return result && result.versions && result.versions.length === 1; - }, - isOld(result) { - return !this.isNew(result); - }, - isDifferent(result, entry) { - return ( - this.isOld(result) && - result.versions[0][entry] != result.versions[1][entry] - ); } } }; diff -r 545304d3ff93 -r 57c8cfff4920 client/src/components/systemconfiguration/MorphologyClassbreaks.vue --- a/client/src/components/systemconfiguration/MorphologyClassbreaks.vue Mon Jul 01 11:08:19 2019 +0200 +++ b/client/src/components/systemconfiguration/MorphologyClassbreaks.vue Mon Jul 01 11:08:57 2019 +0200 @@ -11,8 +11,42 @@ v-for="(value, i) in morphologyClassbreaks" :key="i" > +

+ +

+ + +

+ +

+ + +

.classbreak - width: 92px + width: 105px .btn-outline-secondary border-color: #ccc color: #ccc &:hover background: #eee color: #dc3545 + .color-picker + position: absolute + top: -4px + left: 19px + z-index: 9 + overflow: hidden + border-top-left-radius: 0 !important + .btn + border-radius: 0 !important + .vc-chrome + box-shadow: none +/deep/ + .vc-chrome-alpha-wrap + display: none !important + .vc-chrome-hue-wrap + margin-top: 10px + .vc-chrome-saturation-wrap + border-radius: 0 diff -r 545304d3ff93 -r 57c8cfff4920 client/src/main.js --- a/client/src/main.js Mon Jul 01 11:08:19 2019 +0200 +++ b/client/src/main.js Mon Jul 01 11:08:57 2019 +0200 @@ -75,6 +75,7 @@ faMapMarkedAlt, faMinus, faObjectGroup, + faPaintBrush, faPaperPlane, faPencilAlt, faPlay, @@ -143,6 +144,7 @@ faMapMarkedAlt, faMinus, faObjectGroup, + faPaintBrush, faPaperPlane, faPencilAlt, faPlay, diff -r 545304d3ff93 -r 57c8cfff4920 pkg/controllers/srimports.go --- a/pkg/controllers/srimports.go Mon Jul 01 11:08:19 2019 +0200 +++ b/pkg/controllers/srimports.go Mon Jul 01 11:08:57 2019 +0200 @@ -201,9 +201,12 @@ var once sync.Once closeOnce := func() { zr.Close() } + var isZIP bool = false if zr, err = zip.OpenReader(srFile); err != nil { - messages = append(messages, fmt.Sprintf("ZIP problem: %v", err)) + messages = append(messages, fmt.Sprintf("%v - "+ + "Trying TXT file mode.", err)) } else { + isZIP = true defer once.Do(closeOnce) } @@ -216,27 +219,29 @@ find := func(ext string) *zip.File { return common.FindInZIP(zr, ext) } var noXYZ bool - if zr != nil { - noXYZ = find(".xyz") == nil && find(".txt") == nil - } + if isZIP { + if zr != nil { + noXYZ = find(".xyz") == nil && find(".txt") == nil + } - if noXYZ { - messages = append(messages, "no .xyz or .txt file found.") - } + if noXYZ { + messages = append(messages, "no .xyz or .txt file found.") + } - if mj := find("meta.json"); mj == nil { - messages = append(messages, "no 'meta.json' file found.") - } else { - if meta, err := loadMeta(mj); err != nil { - messages = append(messages, - fmt.Sprintf("'meta.json' found but invalid: %v", err)) + if mj := find("meta.json"); mj == nil { + messages = append(messages, "no 'meta.json' file found.") } else { - errs := meta.Validate(req.Context(), conn) - for _, err := range errs { + if meta, err := loadMeta(mj); err != nil { messages = append(messages, - fmt.Sprintf("invalid 'meta.json': %v", err)) + fmt.Sprintf("'meta.json' found but invalid: %v", err)) + } else { + errs := meta.Validate(req.Context(), conn) + for _, err := range errs { + messages = append(messages, + fmt.Sprintf("invalid 'meta.json': %v", err)) + } + result.Meta = meta } - result.Meta = meta } } diff -r 545304d3ff93 -r 57c8cfff4920 pkg/controllers/stretches.go --- a/pkg/controllers/stretches.go Mon Jul 01 11:08:19 2019 +0200 +++ b/pkg/controllers/stretches.go Mon Jul 01 11:08:57 2019 +0200 @@ -540,13 +540,13 @@ for _, bn := range loaded { l := bn.measurements.classify( - from, to, + res.from, res.to, bn.ldc, (*availMeasurement).getValue, ) b := bn.measurements.classify( - from, to, + res.from, res.to, bn.breaks, bn.access, ) diff -r 545304d3ff93 -r 57c8cfff4920 pkg/imports/sr.go --- a/pkg/imports/sr.go Mon Jul 01 11:08:19 2019 +0200 +++ b/pkg/imports/sr.go Mon Jul 01 11:08:57 2019 +0200 @@ -224,8 +224,8 @@ z, err := zip.OpenReader(zpath) if err != nil { - feedback.Warn("Expected ZIP file: %v", err) - feedback.Warn("Falling back to TXT file mode.") + feedback.Info("%v", err) + feedback.Info("Falling back to TXT file mode.") z = nil } if z != nil { diff -r 545304d3ff93 -r 57c8cfff4920 schema/default_sysconfig.sql --- a/schema/default_sysconfig.sql Mon Jul 01 11:08:19 2019 +0200 +++ b/schema/default_sysconfig.sql Mon Jul 01 11:08:57 2019 +0200 @@ -35,7 +35,7 @@ INSERT INTO sys_admin.system_config VALUES ('gm_forecast_offset_72h', 15); INSERT INTO sys_admin.system_config VALUES ('gm_forecast_vs_reality_nsc_24h', -12.5); INSERT INTO sys_admin.system_config VALUES ('gm_forecast_vs_reality_nsc_72h', -12.5); -INSERT INTO sys_admin.system_config VALUES ('morphology_classbreaks', '1,1.5,1.7,1.9,2.1,2.3,2.5,2.7,2.9,3.1,3.3,3.5,4.0,4.5,5,5.5,6,6.5,7'); -INSERT INTO sys_admin.system_config VALUES ('morphology_classbreaks_compare', '-2,-1.9,-1.8,-1.7,-1.6,-1.5,-1.4,-1.3,-1.2,-1.1,-1,-0.9,-0.8,-0.7,-0.6,-0.5,-0.4,-0.3,-0.2,-0.1,0,0.1,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,1,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,1.9,2'); +INSERT INTO sys_admin.system_config VALUES ('morphology_classbreaks', '1:#ff00dd,1.5,1.7,1.9,2.1,2.3,2.5:#f25f20,2.7,2.9,3.1,3.3,3.5,4:#8ad51a,4.5,5,5.5,6,6.5,7:#1414ff'); +INSERT INTO sys_admin.system_config VALUES ('morphology_classbreaks_compare', '-2:#06b100,-1.9,-1.8,-1.7,-1.6,-1.5,-1.4,-1.3,-1.2,-1.1,-1:#1cc68e,-0.9,-0.8,-0.7,-0.6,-0.5,-0.4,-0.3,-0.2,-0.1,0:#c2c2c2,0.1,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,1:#fff01a,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,1.9,2:#f80012'); COMMIT;