[chronojump] All exercises on combo analyze combo
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] All exercises on combo analyze combo
- Date: Tue, 24 May 2016 12:21:51 +0000 (UTC)
commit a0537f7656241643c08d5bd9d337821f79cd81a0
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue May 24 14:21:24 2016 +0200
All exercises on combo analyze combo
src/gui/encoder.cs | 21 +++++++++++++++++----
src/gui/encoderSelectRepetitions.cs | 10 +++-------
src/sqlite/encoder.cs | 12 +++++++++---
3 files changed, 29 insertions(+), 14 deletions(-)
---
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 9e3f43b..ce39ddb 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -2979,10 +2979,20 @@ public partial class ChronoJumpWindow
UtilGtk.ComboUpdate(combo_encoder_exercise_capture, exerciseNamesToCombo, "");
combo_encoder_exercise_capture.Active =
UtilGtk.ComboMakeActive(combo_encoder_exercise_capture,
Catalog.GetString(((EncoderExercise) encoderExercises[0]).name));
+
+ exerciseNamesToCombo = addAllExercisesToComboExerciseAnalyze(exerciseNamesToCombo);
UtilGtk.ComboUpdate(combo_encoder_exercise_analyze, exerciseNamesToCombo, "");
- combo_encoder_exercise_analyze.Active =
UtilGtk.ComboMakeActive(combo_encoder_exercise_analyze,
- Catalog.GetString(((EncoderExercise) encoderExercises[0]).name));
+ combo_encoder_exercise_analyze.Active = 0; //first one active "All exercises"
+ }
+ private string [] addAllExercisesToComboExerciseAnalyze(string [] exerciseNamesToCombo) {
+
+ exerciseNamesToCombo = Util.AddArrayString(exerciseNamesToCombo, Catalog.GetString("All
exercises"), true); //first
+ encoderExercisesTranslationAndBodyPWeight = Util.AddArrayString(
+ encoderExercisesTranslationAndBodyPWeight,
+ -1 + ":" + "All exercises" + ":" + Catalog.GetString("All exercises") + ":" +
0, true); //first
+
+ return(exerciseNamesToCombo);
}
private void createComboAnalyzeCross(bool firstCreation, bool dateOnX)
@@ -3456,8 +3466,11 @@ public partial class ChronoJumpWindow
i++;
}
UtilGtk.ComboUpdate(combo_encoder_exercise_capture, exerciseNamesToCombo, "");
- UtilGtk.ComboUpdate(combo_encoder_exercise_analyze, exerciseNamesToCombo, "");
combo_encoder_exercise_capture.Active =
UtilGtk.ComboMakeActive(combo_encoder_exercise_capture, name);
+
+ exerciseNamesToCombo = addAllExercisesToComboExerciseAnalyze(exerciseNamesToCombo);
+
+ UtilGtk.ComboUpdate(combo_encoder_exercise_analyze, exerciseNamesToCombo, "");
combo_encoder_exercise_analyze.Active =
UtilGtk.ComboMakeActive(combo_encoder_exercise_analyze, name);
genericWin.HideAndNull();
@@ -3508,7 +3521,7 @@ public partial class ChronoJumpWindow
Sqlite.DeleteFromAnInt(false, Constants.Encoder1RMTable, "exerciseID",
genericWin.uniqueID);
genericWin.HideAndNull();
-
+
createEncoderComboExerciseAndAnalyze();
combo_encoder_exercise_capture.Active = 0;
combo_encoder_exercise_analyze.Active = 0;
diff --git a/src/gui/encoderSelectRepetitions.cs b/src/gui/encoderSelectRepetitions.cs
index 81ba9e7..5510b46 100644
--- a/src/gui/encoderSelectRepetitions.cs
+++ b/src/gui/encoderSelectRepetitions.cs
@@ -37,9 +37,8 @@ public class EncoderSelectRepetitions
protected Person currentPerson;
protected Session currentSession;
protected GenericWindow genericWin;
-// protected Gtk.ComboBox combo_encoder_analyze_curve_num_combo;
protected Gtk.Button button_encoder_analyze;
- protected int exerciseID;
+ protected int exerciseID; //can be -1 (all)
protected bool askDeletion;
protected int dateColumn;
@@ -77,9 +76,7 @@ public class EncoderSelectRepetitions
}
public void PassVariables(Person currentP, Session currentS,
- GenericWindow gw, //Gtk.ComboBox combo_curves,
- Gtk.Button button_e_a, int exID,
- bool askDel)
+ GenericWindow gw, Gtk.Button button_e_a, int exID, bool askDel)
{
RepsActive = 0;
RepsAll = 0;
@@ -89,9 +86,8 @@ public class EncoderSelectRepetitions
currentSession = currentS;
genericWin = gw;
- //combo_encoder_analyze_curve_num_combo = combo_curves;
button_encoder_analyze = button_e_a;
- exerciseID = exID;
+ exerciseID = exID; //can be -1 (all)
askDeletion = askDel;
}
diff --git a/src/sqlite/encoder.cs b/src/sqlite/encoder.cs
index bed95d0..866344d 100644
--- a/src/sqlite/encoder.cs
+++ b/src/sqlite/encoder.cs
@@ -315,10 +315,15 @@ class SqliteEncoder : Sqlite
}
+ //exerciseID can be -1 to get all exercises
public static ArrayList SelectCompareIntersession (bool dbconOpened, int exerciseID, int personID)
{
if(! dbconOpened)
Sqlite.Open();
+
+ string exerciseIDStr = "";
+ if(exerciseID != -1)
+ exerciseIDStr = "encoder.exerciseID = " + exerciseID + " AND ";
//returns a row for each session where there are active or inactive
dbcmd.CommandText =
@@ -326,9 +331,10 @@ class SqliteEncoder : Sqlite
" SUM(CASE WHEN encoder.status = \"active\" THEN 1 END) as active, " +
" SUM(CASE WHEN encoder.status = \"inactive\" THEN 1 END) as inactive " +
" FROM encoder, session, person77 " +
- " WHERE encoder.exerciseID == " + exerciseID + " AND " +
- " encoder.personID == " + personID + " AND signalOrCurve == \"curve\" AND " +
- " encoder.personID == person77.uniqueID AND encoder.sessionID == session.uniqueID " +
+ " WHERE " +
+ exerciseIDStr +
+ " encoder.personID = " + personID + " AND signalOrCurve = \"curve\" AND " +
+ " encoder.personID = person77.uniqueID AND encoder.sessionID = session.uniqueID " +
" GROUP BY encoder.sessionID ORDER BY encoder.sessionID, encoder.status";
LogB.SQL(dbcmd.CommandText.ToString());
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]