[Lada-commits] [PATCH 5 of 5] merged
Wald Commits
scm-commit at wald.intevation.org
Mon Mar 16 17:31:25 CET 2015
# HG changeset patch
# User Raimund Renkert <raimund.renkert at intevation.de>
# Date 1426523535 -3600
# Node ID f4f76fc04e2864cc5cf8e732e776011058013a9d
# Parent def8def373e8e31e82c7cfb30055601b11f6f014
# Parent b8d55860824d502ad4b48023fe06314b7438f659
merged.
diff -r def8def373e8 -r f4f76fc04e28 app/view/form/Probe.js
--- a/app/view/form/Probe.js Mon Mar 16 17:31:41 2015 +0100
+++ b/app/view/form/Probe.js Mon Mar 16 17:32:15 2015 +0100
@@ -95,6 +95,7 @@
border: 0,
width: '50%',
minWidth: 300,
+ margin: '0, 1, 0, 0',
items: [{
xtype: 'fset',
title: 'Erweiterte Angaben',
@@ -105,43 +106,50 @@
editable: false,
name: 'datenbasisId',
fieldLabel: 'Datenbasis',
- labelWidth: 100,
+ anchor: '100%',
+ labelWidth: 105,
}, {
xtype: 'betriebsart',
name: 'baId',
fieldLabel: 'Betriebsart',
- labelWidth: 100,
+ anchor: '100%',
+ labelWidth: 105,
}, {
xtype: 'testdatensatz',
name: 'test',
fieldLabel: 'Testdatensatz',
- labelWidth: 100,
+ anchor: '100%',
+ labelWidth: 105,
allowBlank: false,
}, {
xtype: 'probenart',
editable: false,
name: 'probenartId',
fieldLabel: 'Probenart',
- labelWidth: 100,
+ anchor: '100%',
+ labelWidth: 105,
allowBlank: false,
}, {
xtype: 'numberfield',
allowDecimals: false,
name: 'probeNehmerId',
fieldLabel: 'Probennehmer',
- labelWidth: 100,
+ anchor: '100%',
+ labelWidth: 105,
}, {
xtype: 'netzbetreiber',
name: 'netzbetreiberId',
editable: false,
fieldLabel: 'Netzbetreiber',
- labelWidth: 100,
+ anchor: '100%',
+ labelWidth: 105,
allowBlank: false,
}, {
xtype: 'tfield',
name: 'x11',
fieldLabel: 'Datensatzerzeuger',
- labelWidth: 100,
+ anchor: '100%',
+ labelWidth: 105,
}]
}]
}]
diff -r def8def373e8 -r f4f76fc04e28 app/view/grid/MKommentar.js
--- a/app/view/grid/MKommentar.js Mon Mar 16 17:31:41 2015 +0100
+++ b/app/view/grid/MKommentar.js Mon Mar 16 17:32:15 2015 +0100
@@ -61,11 +61,13 @@
}, {
header: 'Datum',
dataIndex: 'datum',
+ xtype: 'datecolumn',
+ format: 'd.m.Y H:i',
editor: {
xtype: 'datefield',
allowBlank: false,
- format: 'd.m.Y',
- maxValue: Ext.Date.format(new Date(), 'd.m.Y')
+ format: 'd.m.Y H:i',
+ maxValue: Ext.Date.format(new Date(), 'd.m.Y H:i')
}
}, {
header: 'Text',
diff -r def8def373e8 -r f4f76fc04e28 app/view/grid/Messung.js
--- a/app/view/grid/Messung.js Mon Mar 16 17:31:41 2015 +0100
+++ b/app/view/grid/Messung.js Mon Mar 16 17:32:15 2015 +0100
@@ -65,14 +65,16 @@
}, {
header: 'Messzeit',
dataIndex: 'messzeitpunkt',
+ xtype: 'datecolumn',
+ format: 'd.m.Y H:i',
flex: 2,
editor: {
xtype: 'datefield',
allowBlank: false,
- format: 'd.m.Y',
+ format: 'd.m.Y H:i',
// minValue: '01.01.2001', //todo: gibt es das?
// minText: 'Das Datum der Messung darf nicht vor dem 01.01.2001 liegen.',
- maxValue: Ext.Date.format(new Date(), 'd.m.Y')
+ maxValue: Ext.Date.format(new Date(), 'd.m.Y H:i')
}
}, {
header: 'Status',
diff -r def8def373e8 -r f4f76fc04e28 app/view/grid/Messwert.js
--- a/app/view/grid/Messwert.js Mon Mar 16 17:31:41 2015 +0100
+++ b/app/view/grid/Messwert.js Mon Mar 16 17:32:15 2015 +0100
@@ -72,6 +72,7 @@
}, {
header: 'Messwert',
dataIndex: 'messwert',
+ xtype: 'numbercolumn',
width: 80,
editor: {
xtype: 'numberfield',
@@ -97,15 +98,18 @@
}
}, {
header: '<NWG',
+ xtype: 'numbercolumn',
width: 60,
dataIndex: 'messwertNwg'
}, {
header: 'Nachweisgrenze',
+ xtype: 'numbercolumn',
width: 110,
dataIndex: 'nwgZuMesswert'
}, {
header: 'Messfehler',
dataIndex: 'messfehler',
+ xtype: 'numbercolumn',
width: 80,
editor: {
xtype: 'numberfield',
diff -r def8def373e8 -r f4f76fc04e28 app/view/grid/Probenzusatzwert.js
--- a/app/view/grid/Probenzusatzwert.js Mon Mar 16 17:31:41 2015 +0100
+++ b/app/view/grid/Probenzusatzwert.js Mon Mar 16 17:32:15 2015 +0100
@@ -49,11 +49,11 @@
this.columns = [{
header: 'PZW-ID',
dataIndex: 'id',
- width: 70
+ flex: 1,
}, {
header: 'PZW-Größe',
dataIndex: 'pzsId',
- flex: 1,
+ flex: 3,
renderer: function(value) {
if (!value || value === '') {
return '';
@@ -72,21 +72,16 @@
}, {
header: 'Messwert',
dataIndex: 'messwertPzs',
- width: 80,
- renderer: function(value, meta, record) {
- var nwg = record.get('nwgZuMesswert');
- if (value < nwg) {
- return '<' + value;
- }
- return value;
- },
+ xtype: 'numbercolumn',
+ flex: 1,
editor: {
+ xtype: 'numberfield',
allowBlank: false
}
}, {
header: 'Maßeinheit',
dataIndex: 'pzsId',
- width: 80,
+ flex: 1,
renderer: function(value) {
if (!value || value === '') {
return '';
@@ -100,16 +95,34 @@
}, {
header: 'Nachweisgrenze',
dataIndex: 'nwgZuMesswert',
- width: 110,
+ xtype: 'numbercolumn',
+ format: '0',
+ flex: 1,
editor: {
+ xtype: 'numberfield',
allowBlank: false
}
}, {
header: 'rel. Unsich.[%]',
dataIndex: 'messfehler',
+ xtype: 'numbercolumn',
+ format: '0',
+ flex: 1,
editor: {
+ xtype: 'numberfield',
allowBlank: false
}
+ }, {
+ header: '< NWG',
+ flex: 1,
+ renderer: function(value, meta, record) {
+ var nwg = record.get('nwgZuMesswert');
+ var mw = record.get('messwertPzs');
+ if ( mw < nwg) {
+ return 'MW < NWG';
+ }
+ return '';
+ }
}];
this.initData();
this.callParent(arguments);
diff -r def8def373e8 -r f4f76fc04e28 app/view/grid/Status.js
--- a/app/view/grid/Status.js Mon Mar 16 17:31:41 2015 +0100
+++ b/app/view/grid/Status.js Mon Mar 16 17:32:15 2015 +0100
@@ -94,10 +94,12 @@
}, {
header: 'Datum',
dataIndex: 'sdatum',
+ xtype: 'datecolumn',
+ format: 'd.m.Y H:i',
editor: {
xtype: 'datefield',
allowBlank: false,
- format: 'd.m.Y',
+ format: 'd.m.Y H:i',
maxValue: Ext.Date.format(new Date(), 'd.m.Y')
}
}, {
diff -r def8def373e8 -r f4f76fc04e28 index.html
--- a/index.html Mon Mar 16 17:31:41 2015 +0100
+++ b/index.html Mon Mar 16 17:32:15 2015 +0100
@@ -19,7 +19,9 @@
<!-- <x-compile> -->
<!-- <x-bootstrap> -->
<script type="text/javascript" src="extjs/ext-all-debug.js"></script>
+ <script type="text/javascript" src="extjs/locale/ext-lang-de.js"></script>
<!-- </x-bootstrap> -->
+ <script type="text/javascript" src="resources/lib/translations_de.js"></script>
<script type="text/javascript" src="app.js"></script>
<!-- </x-compile> -->
</head>
diff -r def8def373e8 -r f4f76fc04e28 resources/lib/translations_de.js
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/resources/lib/translations_de.js Mon Mar 16 17:32:15 2015 +0100
@@ -0,0 +1,28 @@
+/* Copyright (C) 2013 by Bundesamt fuer Strahlenschutz
+ * Software engineering by Intevation GmbH
+ *
+ * This file is Free Software under the GNU GPL (v>=3)
+ * and comes with ABSOLUTELY NO WARRANTY! Check out
+ * the documentation coming with IMIS-Labordaten-Application for details.
+ */
+
+/*
+ * More Translations for extJS.
+ * Not everything is covered in the original translation.
+ * This file can be used to extend it.
+ */
+
+Ext.onReady(function() {
+ if (Ext.grid.RowEditor) {
+ Ext.grid.RowEditor.prototype.saveBtnText = "Speichern";
+ Ext.grid.RowEditor.prototype.cancelBtnText = "Abbrechen";
+ }
+
+ //this will not work... :-(
+ /*
+ Ext.override(Ext.ux.DateTimePicker ,{
+ todayText: "Heute",
+ timeLabel: "Uhrzeit"
+ });
+ */
+});
More information about the Lada-commits
mailing list