Moved format of element value from provider.

diff --git a/configure.ac b/configure.ac
index 5d14ebb07ff843be419da2fef47c35a9e12f97d7..b9f044deb2370dced60349c1cbaebf411343a619 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -42,7 +42,8 @@ AM_GLIB_GNU_GETTEXT
 PKG_CHECK_MODULES(ZAKFORM, [glib-2.0 >= 2.36
                             gobject-2.0 >= 2.36
                             gmodule-2.0 >= 2.0.0
-                            libxml-2.0 >= 2.0.0])
+                            libxml-2.0 >= 2.0.0
+                            libzakutils])
 
 AC_SUBST(ZAKFORM_CFLAGS)
 AC_SUBST(ZAKFORM_LIBS)

diff --git a/src/formelement.c b/src/formelement.c
index 313ca41cf51094ba0a17b91e912ff5beb1a76785..80491a8a53335f0681a8b33555ec3d666432ae1c 100644 (file)
--- a/src/formelement.c
+++ b/src/formelement.c
@@ -20,6 +20,8 @@
        #include <config.h>
 #endif
 
+#include <libzakutils/libzakutils.h>
+
 #include "formelement.h"
 
 enum
@@ -354,6 +356,70 @@ gchar
        return ret;
 }
 
+static gchar
+*zak_form_element_format (ZakFormElement *element, const gchar *value)
+{
+       gchar *ret;
+
+       gchar *type;
+       GHashTable *format;
+
+       type = zak_form_element_get_provider_type (element);
+       format = zak_form_element_get_format (element);
+
+       if (g_ascii_strcasecmp (type, "integer") == 0)
+               {
+                       gchar *thousands_saparator;
+                       gchar *formatted;
+
+                       thousands_saparator = (gchar *)g_hash_table_lookup (format, "thousands_separator");
+                       formatted = zak_utils_format_money_full (g_strtod (value, NULL), 0, thousands_saparator, NULL);
+
+                       ret = g_strdup (formatted);
+               }
+       else if (g_ascii_strcasecmp (type, "float") == 0)
+               {
+                       gchar *thousands_saparator;
+                       gchar *formatted;
+                       gchar *decimals;
+                       gchar *currency_symbol;
+
+                       thousands_saparator = (gchar *)g_hash_table_lookup (format, "thousands_separator");
+                       decimals = (gchar *)g_hash_table_lookup (format, "decimals");
+                       currency_symbol = (gchar *)g_hash_table_lookup (format, "currency_symbol");
+                       formatted = zak_utils_format_money_full (g_strtod (value, NULL), strtol (decimals, NULL, 10), thousands_saparator, currency_symbol);
+
+                       ret = g_strdup (formatted);
+               }
+       else if (g_ascii_strcasecmp (type, "string") == 0)
+               {
+                       ret = g_strdup (value);
+               }
+       else if (g_ascii_strcasecmp (type, "boolean") == 0)
+               {
+                       ret = g_strdup (value);
+               }
+       else if (g_ascii_strcasecmp (type, "date") == 0
+                        || g_ascii_strcasecmp (type, "time") == 0
+                        || g_ascii_strcasecmp (type, "datetime") == 0)
+               {
+                       GDateTime *gdt;
+
+                       gchar *datetime_format;
+
+                       datetime_format = (gchar *)g_hash_table_lookup (format, "content");
+                       gdt = zak_utils_get_gdatetime_from_string (value, NULL);
+                       ret = zak_utils_gdatetime_format (gdt, datetime_format);
+
+                       if (gdt != NULL)
+                               {
+                                       g_date_time_unref (gdt);
+                               }
+               }
+
+       return ret;
+}
+
 /**
  * zak_form_element_set_value:
  * @element:
@@ -376,7 +442,7 @@ zak_form_element_set_value (ZakFormElement *element, const gchar *value)
                        g_free (priv->value);
                }
 
-       priv->value = g_strdup (value);
+       priv->value = zak_form_element_format (element, value);
 
        if (ZAK_FORM_ELEMENT_GET_CLASS (element)->set_value != NULL)
                {