[chronojump] All server stuff works now
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] All server stuff works now
- Date: Tue, 9 Mar 2010 06:03:56 +0000 (UTC)
commit 6a51c0c3935dccafde9e801d747d53b8221d7d7a
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Mar 9 14:02:36 2010 +0800
All server stuff works now
chronojump_server/bin/chronojumpServer.dll | Bin 279552 -> 280064 bytes
glade/chronojump.glade | 87 ++++++++++++++-------------
sqlite_diagrams/chronojump_sqlite.dia | Bin 12715 -> 12209 bytes
sqlite_diagrams/chronojump_sqlite.png | Bin 311000 -> 286681 bytes
src/personSession.cs | 4 +-
src/server.cs | 1 +
6 files changed, 48 insertions(+), 44 deletions(-)
---
diff --git a/chronojump_server/bin/chronojumpServer.dll b/chronojump_server/bin/chronojumpServer.dll
index e5aa1b9..296a13b 100755
Binary files a/chronojump_server/bin/chronojumpServer.dll and b/chronojump_server/bin/chronojumpServer.dll differ
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index e440b19..b418ac4 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -3399,7 +3399,7 @@ options</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
- <property name="adjustment">1 0 100 1 10 10</property>
+ <property name="adjustment">1 0 100 1 10 0</property>
<property name="climb_rate">1</property>
</widget>
<packing>
@@ -3648,7 +3648,7 @@ options</property>
<widget class="GtkSpinButton" id="spinbutton_mark_consecutives">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">5 1 100 1 10 10</property>
+ <property name="adjustment">5 1 100 1 10 0</property>
<property name="climb_rate">1</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
@@ -3852,7 +3852,7 @@ options</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
- <property name="adjustment">10 1 99 1 10 100</property>
+ <property name="adjustment">10 1 99 1 10 0</property>
<property name="climb_rate">1</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
@@ -3876,7 +3876,7 @@ options</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
- <property name="adjustment">1 1 99 1 10 10</property>
+ <property name="adjustment">1 1 99 1 10 0</property>
<property name="climb_rate">1</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
@@ -4465,7 +4465,7 @@ options</property>
<widget class="GtkSpinButton" id="spin_graph_margin_b">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">5 1 20 1 1 1</property>
+ <property name="adjustment">5 1 20 1 1 0</property>
<property name="climb_rate">1</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
@@ -4499,7 +4499,7 @@ options</property>
<widget class="GtkSpinButton" id="spin_graph_margin_l">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">4 1 20 1 1 1</property>
+ <property name="adjustment">4 1 20 1 1 0</property>
<property name="climb_rate">1</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
@@ -4533,7 +4533,7 @@ options</property>
<widget class="GtkSpinButton" id="spin_graph_margin_t">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">4 1 20 1 1 1</property>
+ <property name="adjustment">4 1 20 1 1 0</property>
<property name="climb_rate">1</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
@@ -4567,7 +4567,7 @@ options</property>
<widget class="GtkSpinButton" id="spin_graph_margin_r">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">2 1 20 1 1 1</property>
+ <property name="adjustment">2 1 20 1 1 0</property>
<property name="climb_rate">1</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
@@ -4974,6 +4974,7 @@ options</property>
<child>
<widget class="GtkVBox" id="vbox45">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">8</property>
<child>
<widget class="GtkLabel" id="label132">
@@ -5211,7 +5212,7 @@ options</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
- <property name="adjustment">1 0 100 1 10 10</property>
+ <property name="adjustment">1 0 100 1 10 0</property>
<property name="climb_rate">1</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
@@ -5284,6 +5285,7 @@ options</property>
<child>
<widget class="GtkVBox" id="vbox149">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
<widget class="GtkRadioButton" id="radiobutton_dist_variable">
<property name="label" translatable="yes">Variable (user will select distance at each test)</property>
@@ -5327,7 +5329,7 @@ options</property>
<widget class="GtkSpinButton" id="spin_distance_fixed">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">100 0 99999 1 10 10</property>
+ <property name="adjustment">100 0 99999 1 10 0</property>
<property name="climb_rate">1</property>
<property name="digits">2</property>
<property name="numeric">True</property>
@@ -5596,6 +5598,7 @@ suitable for agility tests)</property>
<child>
<widget class="GtkVBox" id="vbox49">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<widget class="GtkCheckButton" id="checkbutton_only_current_session">
@@ -5653,7 +5656,9 @@ suitable for agility tests)</property>
<child>
<widget class="GtkTreeView" id="treeview_person_show_all_events">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">True</property>
+ <property name="headers_clickable">False</property>
</widget>
</child>
</widget>
@@ -9725,6 +9730,7 @@ Test</b></property>
<child>
<widget class="GtkVBox" id="vbox95">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<widget class="GtkLabel" id="label333">
@@ -9749,6 +9755,7 @@ Test</b></property>
<child>
<widget class="GtkVBox" id="vbox96">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
<widget class="GtkCheckButton" id="checkbutton_jump_tf_tc_best">
<property name="visible">True</property>
@@ -9976,6 +9983,7 @@ Test</b></property>
<property name="left_padding">12</property>
<child>
<widget class="GtkScrolledWindow" id="scrolledwin_conditions">
+ <property name="height_request">120</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">never</property>
@@ -9989,6 +9997,7 @@ Test</b></property>
<child>
<widget class="GtkVBox" id="vbox99">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
<widget class="GtkTable" id="table_jump_conditions">
<property name="visible">True</property>
@@ -10561,7 +10570,7 @@ Test</b></property>
<widget class="GtkSpinButton" id="spinbutton_tf_greater">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">0.59999998658880005 0 1 0.0099999997764800008 0.0099999997764800008 0.0099999997764800008</property>
+ <property name="adjustment">0.59999998658880005 0 1 0.0099999997764800008 0.01 0</property>
<property name="climb_rate">1</property>
<property name="digits">2</property>
<property name="snap_to_ticks">True</property>
@@ -10580,7 +10589,7 @@ Test</b></property>
<widget class="GtkSpinButton" id="spinbutton_tf_lower">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">0.29999999329440002 0 1 0.0099999997764800008 0.0099999997764800008 0.0099999997764800008</property>
+ <property name="adjustment">0.29999999329440002 0 1 0.0099999997764800008 0.0099999997764800008 0</property>
<property name="climb_rate">1</property>
<property name="digits">2</property>
<property name="snap_to_ticks">True</property>
@@ -10599,7 +10608,7 @@ Test</b></property>
<widget class="GtkSpinButton" id="spinbutton_tc_greater">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">0.29999999329440002 0 1 0.0099999997764800008 0.0099999997764800008 0.0099999997764800008</property>
+ <property name="adjustment">0.29999999329440002 0 1 0.0099999997764800008 0.0099999997764800008 0</property>
<property name="climb_rate">1</property>
<property name="digits">2</property>
<property name="snap_to_ticks">True</property>
@@ -10618,7 +10627,7 @@ Test</b></property>
<widget class="GtkSpinButton" id="spinbutton_tc_lower">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">0.19999999552960002 0 1 0.0099999997764800008 0.0099999997764800008 0.0099999997764800008</property>
+ <property name="adjustment">0.19999999552960002 0 1 0.0099999997764800008 0.0099999997764800008 0</property>
<property name="climb_rate">1</property>
<property name="digits">2</property>
<property name="snap_to_ticks">True</property>
@@ -10637,7 +10646,7 @@ Test</b></property>
<widget class="GtkSpinButton" id="spinbutton_tf_tc_greater">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">2.7499999385299998 0 6 0.0099999997764800008 0.0099999997764800008 0.0099999997764800008</property>
+ <property name="adjustment">2.7499999385299998 0 6 0.0099999997764800008 0.0099999997764800008 0</property>
<property name="climb_rate">1</property>
<property name="digits">2</property>
<property name="snap_to_ticks">True</property>
@@ -10656,7 +10665,7 @@ Test</b></property>
<widget class="GtkSpinButton" id="spinbutton_tf_tc_lower">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">0.99999997764800008 0 6 0.0099999997764800008 0.0099999997764800008 0.0099999997764800008</property>
+ <property name="adjustment">0.99999997764800008 0 6 0.0099999997764800008 0.0099999997764800008 0</property>
<property name="climb_rate">1</property>
<property name="digits">2</property>
<property name="snap_to_ticks">True</property>
@@ -10884,7 +10893,7 @@ Test</b></property>
<widget class="GtkSpinButton" id="spinbutton_time_lower">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">11 0 1000 0.5 1 10</property>
+ <property name="adjustment">11 0 1000 0.5 1 0</property>
<property name="climb_rate">1</property>
<property name="digits">1</property>
<property name="snap_to_ticks">True</property>
@@ -10903,7 +10912,7 @@ Test</b></property>
<widget class="GtkSpinButton" id="spinbutton_time_greater">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">39 0 1000 0.5 1 10</property>
+ <property name="adjustment">39 0 1000 0.5 1 0</property>
<property name="climb_rate">1</property>
<property name="digits">1</property>
<property name="snap_to_ticks">True</property>
@@ -13330,6 +13339,7 @@ comments</property>
<child>
<widget class="GtkVBox" id="vbox_main">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="spacing">10</property>
<child>
<widget class="GtkLabel" id="label502">
@@ -13439,6 +13449,7 @@ comments</property>
<widget class="GtkWindow" id="generic_window">
<property name="visible">True</property>
<property name="border_width">10</property>
+ <property name="title" translatable="yes">Chronojump</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="type_hint">dialog</property>
@@ -13970,32 +13981,12 @@ times</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox289">
+ <widget class="GtkVBox" id="vbox150">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<child>
- <widget class="GtkVBox" id="vbox150">
+ <widget class="GtkLabel" id="label_uploaded_sports">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <widget class="GtkLabel" id="label_uploaded_sports">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label_uploaded_test_types">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -14004,6 +13995,16 @@ times</property>
</packing>
</child>
<child>
+ <widget class="GtkLabel" id="label_uploaded_test_types">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkLabel" id="label_thanks">
<property name="visible">True</property>
<property name="label" translatable="yes">Thanks for your time. Graphs will be updated on server at 3h7min UTC.</property>
@@ -14011,12 +14012,14 @@ times</property>
</widget>
<packing>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="padding">8</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
diff --git a/sqlite_diagrams/chronojump_sqlite.dia b/sqlite_diagrams/chronojump_sqlite.dia
index 8059625..f572e07 100644
Binary files a/sqlite_diagrams/chronojump_sqlite.dia and b/sqlite_diagrams/chronojump_sqlite.dia differ
diff --git a/sqlite_diagrams/chronojump_sqlite.png b/sqlite_diagrams/chronojump_sqlite.png
index 8dc96f5..a22d2ec 100644
Binary files a/sqlite_diagrams/chronojump_sqlite.png and b/sqlite_diagrams/chronojump_sqlite.png differ
diff --git a/src/personSession.cs b/src/personSession.cs
index 20b2855..0dbc65e 100644
--- a/src/personSession.cs
+++ b/src/personSession.cs
@@ -97,13 +97,13 @@ public partial class PersonSession {
public override string ToString()
{
- return "";
- //return "[uniqueID: " + uniqueID + "]" + name + ", " + ", " + sex + ", " + dateBorn.ToShortDateString() + ", " + description;
+ return "[uniqueID: " + uniqueID + "]," + personID + ", " + ", " + sessionID + ", " + height + ", " + weight + ", " + sportID + ", " + speciallityID + ", " + practice + ", " + comments;
}
public int UniqueID {
get { return uniqueID; }
+ set { uniqueID = value; }
}
public int PersonID {
diff --git a/src/server.cs b/src/server.cs
index fbc736d..1f1fc25 100644
--- a/src/server.cs
+++ b/src/server.cs
@@ -560,6 +560,7 @@ public class Server
if(sportUserDefinedLocal != -1)
ps.SportID = sportUserDefinedLocal;
+ ps.UniqueID = -1;
ps.PersonID = personServerID;
ps.SessionID = sessionServerID;
myServer.UploadPersonSessionIfNeeded(ps);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
