diff --git a/db/db-iterator.c b/db/db-iterator.c index 39b479d..affb340 100644 --- a/db/db-iterator.c +++ b/db/db-iterator.c @@ -358,9 +358,6 @@ gboolean db_iterator_move_previous (DbIterator * self) if (db_model_iter_prev (model, iter)) move = db_iterator_move_iter (self, iter); - else - g_warning ("Can't move the cursor to the previous " - "row, because there are no more rows."); db_iter_free (iter); } @@ -394,9 +391,6 @@ gboolean db_iterator_move_next (DbIterator * self) if (db_model_iter_next (model, iter)) move = db_iterator_move_iter (self, iter); - else - g_warning ("Can't move the cursor to the next " - "row, because there are no more rows."); db_iter_free (iter); } @@ -404,6 +398,7 @@ gboolean db_iterator_move_next (DbIterator * self) move = db_iterator_move_first (self); return move; + } /** @@ -427,9 +422,9 @@ gboolean db_iterator_move_to (DbIterator * self, DbIteratorMove move) return db_iterator_move_next (self); case DB_ITERATOR_MOVE_LAST: return db_iterator_move_last (self); - default: - return FALSE; } + + return FALSE; } /** @@ -778,10 +773,10 @@ gboolean db_iterator_has_pending_operations (DbIterator * self) } // Useful methods -/* + static void db_iterator_take_value (DbIterator * self, const gchar * column_name, GValue * value) { - db_iterator_set_value (self, const gchar * column_name, value); + db_iterator_set_value (self, column_name, value, NULL); gvn_value_free (value); } @@ -882,7 +877,6 @@ void db_iterator_set_boxed (DbIterator * self, const gchar * column_name, gpoint db_iterator_take_value (self, column_name, gvn_value_new_boxed (value)); } -*/ /* * db_iterator_is_ready: diff --git a/db/db-iterator.h b/db/db-iterator.h index c5e3e46..e413010 100644 --- a/db/db-iterator.h +++ b/db/db-iterator.h @@ -115,10 +115,6 @@ gboolean db_iterator_move_to (DbIterator * self, DbIteratorMove move); void db_iterator_refresh (DbIterator * self); const GvnParamSpec * db_iterator_get_spec (DbIterator * self, gint column); gint db_iterator_get_column_index (DbIterator * self, const gchar * name); -const GValue * db_iterator_get_value (DbIterator * self, const gchar * column_name); -gboolean db_iterator_set_value (DbIterator * self, const gchar * column_name, const GValue * value, GError ** err); -const GValue * db_iterator_get_value_by_index (DbIterator * self, gint column); -gboolean db_iterator_set_value_by_index (DbIterator * self, gint column, const GValue * value, GError ** err); void db_iterator_delete (DbIterator * self); void db_iterator_insert (DbIterator * self); gint db_iterator_get_nrows (DbIterator * self); @@ -134,4 +130,23 @@ void db_iterator_operations_done (DbIterator * self); void db_iterator_row_num_changed (DbIterator * self); void db_iterator_status_changed (DbIterator * self, gboolean ready); +const GValue * db_iterator_get_value_by_index (DbIterator * self, gint column); +gboolean db_iterator_set_value_by_index (DbIterator * self, gint column, const GValue * value, GError ** err); +const GValue * db_iterator_get_value (DbIterator * self, const gchar * column_name); +gboolean db_iterator_set_value (DbIterator * self, const gchar * column_name, const GValue * value, GError ** err); +gboolean db_iterator_is_null (DbIterator * self, const gchar * column_name); +void db_iterator_set_null (DbIterator * self, const gchar * column_name); +gboolean db_iterator_get_boolean (DbIterator * self, const gchar * column_name); +void db_iterator_set_boolean (DbIterator * self, const gchar * column_name, gboolean value); +gint db_iterator_get_int (DbIterator * self, const gchar * column_name); +void db_iterator_set_int (DbIterator * self, const gchar * column_name, gint value); +glong db_iterator_get_long (DbIterator * self, const gchar * column_name); +void db_iterator_set_long (DbIterator * self, const gchar * column_name, glong value); +gdouble db_iterator_get_double (DbIterator * self, const gchar * column_name); +void db_iterator_set_double (DbIterator * self, const gchar * column_name, gdouble value); +const gchar * db_iterator_get_string (DbIterator * self, const gchar * column_name); +void db_iterator_set_string (DbIterator * self, const gchar * column_name, const gchar * value); +gpointer db_iterator_get_boxed (DbIterator * self, const gchar * column_name); +void db_iterator_set_boxed (DbIterator * self, const gchar * column_name, gpointer value); + #endif diff --git a/module/data/shelves.glade b/module/data/shelves.glade index 646ca1f..7f87e26 100644 --- a/module/data/shelves.glade +++ b/module/data/shelves.glade @@ -11,18 +11,443 @@ + + + SELECT id, name + FROM warehouse WHERE reserve ORDER BY name + + - CALL vn2008.ubicator_beta (#wh, #date, #filter) + CALL ubicator_beta (#wh, #date, #filter) batch-items False + + + SELECT id, name, width, height, max_height, tray_height, +first_tray_elevation, tray_density, vspacing, hspacing + FROM shelf + DB_MODEL_INSERT | DB_MODEL_DELETE | DB_MODEL_UPDATE + + - - model-items - False + + + + items + False + + + + + False + Edit shelves + False + True + True + dialog + + + False + vertical + 2 + + + False + center + + + Close + True + True + True + + + + True + True + 0 + + + + + False + True + end + 0 + + + + + True + False + center + center + True + True + 8 + 8 + 8 + + + True + False + 6 + 6 + True + + + True + False + 1 + Tray V. spacing: + + + 0 + 8 + + + + + True + False + 1 + Tray H. spacing: + + + 0 + 7 + + + + + True + False + 1 + Tray density: + + + 0 + 6 + + + + + True + False + 1 + Tray elevation: + + + 0 + 5 + + + + + True + False + 1 + Tray height: + + + 0 + 4 + + + + + True + False + 1 + Max. height: + + + 0 + 3 + + + + + True + False + 1 + Height: + + + 0 + 2 + + + + + True + False + 1 + Width: + + + 0 + 1 + + + + + True + False + iter-shelves + vspacing + + + True + 1 + True + + + + + 1 + 8 + + + + + True + False + iter-shelves + hspacing + + + True + 1 + True + + + + + 1 + 7 + + + + + True + False + iter-shelves + tray_density + + + True + 1 + True + + + + + 1 + 6 + + + + + True + False + iter-shelves + first_tray_elevation + + + True + 1 + True + + + + + 1 + 5 + + + + + True + False + iter-shelves + tray_height + + + True + 1 + True + + + + + 1 + 4 + + + + + True + False + iter-shelves + max_height + + + True + 1 + True + + + + + 1 + 3 + + + + + True + False + iter-shelves + height + + + True + 1 + True + + + + + 1 + 2 + + + + + True + False + iter-shelves + width + + + True + 1 + True + + + + + 1 + 1 + + + + + True + False + iter-shelves + name + + + True + + + + + 1 + 0 + + + + + True + False + 1 + Name: + + + 0 + 0 + + + + + 1 + 0 + + + + + True + False + iter-shelves + VN_HANDLER_SHOW_REMOVE | VN_HANDLER_SHOW_ADD + + + 0 + 1 + + + + + True + False + iter-shelves + VN_HANDLER_SHOW_UNDO | VN_HANDLER_SHOW_SAVE + + + 1 + 1 + + + + + 150 + True + True + in + + + True + True + shelves + on-iter + + + multiple + + + + + Configurations + name + + + + + + + + + + 0 + 0 + + + + + False + True + 1 + + + + True @@ -35,8 +460,8 @@ True False center - 4 - 5 + 6 + 6 True @@ -107,14 +532,13 @@ - + True False + whs - - True - 1 - True + + False @@ -123,6 +547,18 @@ 1 + + + True + False + 1 + Shelf: + + + 0 + 3 + + True @@ -132,6 +568,69 @@ 0 + 4 + + + + + True + False + 1 + Max. amount: + + + 0 + 5 + + + + + True + False + 4 + + + True + False + True + False + shelves + + + False + + + + + True + True + 0 + + + + + True + True + True + Edit shelves and it's dimensions + + + + True + False + text-editor-symbolic + + + + + False + True + 1 + + + + + 1 3 @@ -147,18 +646,6 @@ 1 - 3 - - - - - True - False - 1 - Max. amount: - - - 0 4 @@ -176,7 +663,7 @@ 1 - 4 + 5 diff --git a/vn/gui/login.glade b/vn/gui/login.glade index 11f99b6..50a9248 100644 --- a/vn/gui/login.glade +++ b/vn/gui/login.glade @@ -164,11 +164,10 @@ expand - gtk-preferences + Preferences True True True - True @@ -179,11 +178,10 @@ - gtk-connect + Connect True True True - True @@ -232,11 +230,10 @@ spread - gtk-close + Close True True True - True