[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis-gtk] branch master updated: Beamte do not have Rentenve
|
From: |
gnunet |
|
Subject: |
[taler-anastasis-gtk] branch master updated: Beamte do not have Rentenversicherungsnummern, introduce TIN, and support optional fields |
|
Date: |
Tue, 30 Mar 2021 13:07:58 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository anastasis-gtk.
The following commit(s) were added to refs/heads/master by this push:
new a895193 Beamte do not have Rentenversicherungsnummern, introduce TIN,
and support optional fields
a895193 is described below
commit a8951933adfe3bc8e46a1089aee3bc8f807f7dde
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Tue Mar 30 13:07:43 2021 +0200
Beamte do not have Rentenversicherungsnummern, introduce TIN, and support
optional fields
---
contrib/anastasis_gtk_auth_add_email.glade | 1 -
contrib/anastasis_gtk_auth_add_post.glade | 5 ---
contrib/anastasis_gtk_auth_add_question.glade | 8 ++---
contrib/anastasis_gtk_auth_add_sms.glade | 1 -
contrib/anastasis_gtk_main_window.glade | 52 +++++++++++++++++++++++++--
src/anastasis/anastasis-gtk_attributes.c | 6 ++++
6 files changed, 59 insertions(+), 14 deletions(-)
diff --git a/contrib/anastasis_gtk_auth_add_email.glade
b/contrib/anastasis_gtk_auth_add_email.glade
index c7aa9e0..93d885b 100644
--- a/contrib/anastasis_gtk_auth_add_email.glade
+++ b/contrib/anastasis_gtk_auth_add_email.glade
@@ -65,7 +65,6 @@
<child>
<object class="GtkLabel">
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Email
address:</property>
</object>
diff --git a/contrib/anastasis_gtk_auth_add_post.glade
b/contrib/anastasis_gtk_auth_add_post.glade
index 303bc3f..14c1a1a 100644
--- a/contrib/anastasis_gtk_auth_add_post.glade
+++ b/contrib/anastasis_gtk_auth_add_post.glade
@@ -77,7 +77,6 @@
<child>
<object class="GtkLabel">
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">_Full
name:</property>
<property name="use-underline">True</property>
@@ -119,7 +118,6 @@
<child>
<object class="GtkLabel">
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="label"
translatable="yes">_Street:</property>
<property name="use-underline">True</property>
@@ -160,7 +158,6 @@
<child>
<object class="GtkLabel">
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">_City:</property>
<property name="use-underline">True</property>
@@ -201,7 +198,6 @@
<child>
<object class="GtkLabel">
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="label"
translatable="yes">_Postcode:</property>
<property name="use-underline">True</property>
@@ -242,7 +238,6 @@
<child>
<object class="GtkLabel">
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="label"
translatable="yes">Countr_y:</property>
<property name="use-underline">True</property>
diff --git a/contrib/anastasis_gtk_auth_add_question.glade
b/contrib/anastasis_gtk_auth_add_question.glade
index 890b37e..dbb1466 100644
--- a/contrib/anastasis_gtk_auth_add_question.glade
+++ b/contrib/anastasis_gtk_auth_add_question.glade
@@ -74,9 +74,9 @@
<child>
<object class="GtkLabel">
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="can-focus">False</property>
- <property name="label" translatable="yes">Security
question:</property>
+ <property name="label" translatable="yes">Security
_question:</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -135,9 +135,9 @@
<child>
<object class="GtkLabel">
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="can-focus">False</property>
- <property name="label" translatable="yes">Answer:</property>
+ <property name="label" translatable="yes">_Answer:</property>
+ <property name="use-underline">True</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/contrib/anastasis_gtk_auth_add_sms.glade
b/contrib/anastasis_gtk_auth_add_sms.glade
index 412f60f..55c6a05 100644
--- a/contrib/anastasis_gtk_auth_add_sms.glade
+++ b/contrib/anastasis_gtk_auth_add_sms.glade
@@ -65,7 +65,6 @@
<child>
<object class="GtkLabel">
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Phone
number:</property>
</object>
diff --git a/contrib/anastasis_gtk_main_window.glade
b/contrib/anastasis_gtk_main_window.glade
index 22459f0..32a505e 100644
--- a/contrib/anastasis_gtk_main_window.glade
+++ b/contrib/anastasis_gtk_main_window.glade
@@ -629,6 +629,51 @@ Author: Christian Grothoff, Dennis Neufeld
<property
name="position">3</property>
</packing>
</child>
+ <child>
+ <object class="GtkBox"
id="anastasis_gtk_ia_tin_de_box">
+ <property
name="can-focus">False</property>
+ <child>
+ <object class="GtkLabel"
id="anastasis_gtk_ia_tin_de_label">
+ <property
name="visible">True</property>
+ <property
name="can-focus">False</property>
+ <property
name="halign">start</property>
+ <property
name="valign">center</property>
+ <property
name="margin-left">20</property>
+ <property
name="margin-start">20</property>
+ <property name="label"
translatable="yes">Steuerliche Identifikationsnummer:</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="padding">5</property>
+ <property
name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry"
id="anastasis_gtk_ia_tin_de_entry">
+ <property
name="visible">True</property>
+ <property
name="can-focus">True</property>
+ <property
name="max-length">11</property>
+ <property
name="width-chars">12</property>
+ <property
name="max-width-chars">11</property>
+ <property
name="placeholder-text" translatable="yes">12345678912</property>
+ <property
name="input-purpose">number</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="padding">5</property>
+ <property
name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="padding">5</property>
+ <property
name="position">4</property>
+ </packing>
+ </child>
<child>
<object class="GtkBox"
id="anastasis_gtk_ia_ssn_de_box">
<property
name="can-focus">False</property>
@@ -636,11 +681,12 @@ Author: Christian Grothoff, Dennis Neufeld
<object class="GtkLabel"
id="anastasis_gtk_ia_ssn_de_label">
<property
name="visible">True</property>
<property
name="can-focus">False</property>
+ <property name="tooltip-text"
translatable="yes">Falls vorhanden sollte diese Nummer auf jeden Fall angegeben
werden. Nur Beamte, Selbstständige und andere Personen die keine
Rentenversicherungsnummer haben sollten dieses Feld leer lassen.</property>
<property
name="halign">start</property>
<property
name="valign">center</property>
<property
name="margin-left">20</property>
<property
name="margin-start">20</property>
- <property name="label"
translatable="yes">Social security number:</property>
+ <property name="label"
translatable="yes">Sozialversicherungsnummer (optional):</property>
</object>
<packing>
<property
name="expand">False</property>
@@ -672,7 +718,7 @@ Author: Christian Grothoff, Dennis Neufeld
<property
name="expand">False</property>
<property
name="fill">True</property>
<property
name="padding">5</property>
- <property
name="position">4</property>
+ <property
name="position">5</property>
</packing>
</child>
<child>
@@ -717,7 +763,7 @@ Author: Christian Grothoff, Dennis Neufeld
<property
name="expand">False</property>
<property
name="fill">True</property>
<property
name="padding">5</property>
- <property
name="position">5</property>
+ <property
name="position">6</property>
</packing>
</child>
</object>
diff --git a/src/anastasis/anastasis-gtk_attributes.c
b/src/anastasis/anastasis-gtk_attributes.c
index a3953b1..bbf3621 100644
--- a/src/anastasis/anastasis-gtk_attributes.c
+++ b/src/anastasis/anastasis-gtk_attributes.c
@@ -99,7 +99,11 @@ AG_collect_attributes (bool partial)
const char *attr_name;
const char *attr_type;
const char *attr_uuid;
+ int optional = false;
struct GNUNET_JSON_Specification spec[] = {
+ GNUNET_JSON_spec_mark_optional (
+ GNUNET_JSON_spec_boolean ("optional",
+ &optional)),
GNUNET_JSON_spec_string ("type",
&attr_type),
GNUNET_JSON_spec_string ("name",
@@ -138,6 +142,8 @@ AG_collect_attributes (bool partial)
{
if (partial)
continue;
+ if (optional)
+ continue;
json_decref (result);
return NULL;
}
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-anastasis-gtk] branch master updated: Beamte do not have Rentenversicherungsnummern, introduce TIN, and support optional fields,
gnunet <=