EEC
/
CosMoS
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Changement de l'organisation des dossiers virtuels dans le projet CodeLite (include/sources/ressources -> frame/dialogs/objects) 

Changement dans les règles et options de recherches : plus que du délai de publi (en années après date de consult)
master
Maxime Wack 11 years ago
parent
2db17c4b08
commit
9866f6c454
13 changed files with 111 additions and 467 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +60
    -52
      CosMoS/CosMoS.project
  2. +8
    -0
      CosMoS/bdd.h
  3. +1
    -3
      CosMoS/config.cpp
  4. +0
    -2
      CosMoS/config.h
  5. +0
    -19
      CosMoS/misc.cpp
  6. +0
    -8
      CosMoS/misc.h
  7. +14
    -60
      CosMoS/optionsRche.cpp
  8. +7
    -241
      CosMoS/optionsRche.fbp
  9. +5
    -30
      CosMoS/optionsRcheGUI.cpp
  10. +1
    -9
      CosMoS/optionsRcheGUI.h
  11. +12
    -10
      CosMoS/recherche.cpp
  12. +1
    -0
      Sante_Pub.workspace
  13. +2
    -33
      Sante_Pub.workspace.session

+ 60
- 52
CosMoS/CosMoS.project View File

@@ -7,58 +7,6 @@
</Plugins>
<Description/>
<Dependencies/>
<VirtualDirectory Name="src">
<File Name="main.cpp"/>
<File Name="bdd.cpp"/>
<File Name="cosmos.cpp"/>
<VirtualDirectory Name="GUI">
<File Name="optionsGUI.cpp"/>
<File Name="cosmosGUI.cpp"/>
<File Name="correcGUI.cpp"/>
<File Name="optionsRcheGUI.cpp"/>
<File Name="resultatsGUI.cpp"/>
</VirtualDirectory>
<File Name="config.cpp"/>
<File Name="options.cpp"/>
<File Name="correc.cpp"/>
<File Name="optionsRche.cpp"/>
<File Name="recherche.cpp"/>
<File Name="misc.cpp"/>
<File Name="resultats.cpp"/>
</VirtualDirectory>
<VirtualDirectory Name="include">
<File Name="bdd.h"/>
<File Name="cosmos.h"/>
<VirtualDirectory Name="GUI">
<File Name="optionsGUI.h"/>
<File Name="cosmosGUI.h"/>
<File Name="correcGUI.h"/>
<File Name="optionsRcheGUI.h"/>
<File Name="resultatsGUI.h"/>
</VirtualDirectory>
<File Name="config.h"/>
<File Name="options.h"/>
<File Name="correc.h"/>
<File Name="optionsRche.h"/>
<File Name="recherche.h"/>
<File Name="misc.h"/>
<File Name="resultats.h"/>
</VirtualDirectory>
<VirtualDirectory Name="resources">
<File Name="cosmos.fbp"/>
<File Name="options.fbp"/>
<VirtualDirectory Name="icons">
<File Name="icons/correc.xpm"/>
<File Name="icons/export.xpm"/>
<File Name="icons/import.xpm"/>
<File Name="icons/optionsgales.xpm"/>
<File Name="icons/optionsrche.xpm"/>
<File Name="icons/play.xpm"/>
</VirtualDirectory>
<File Name="correc.fbp"/>
<File Name="optionsRche.fbp"/>
<File Name="resultats.fbp"/>
</VirtualDirectory>
<VirtualDirectory Name="tinyxml">
<File Name="tinyxml2.h"/>
<File Name="tinyxml2.cpp"/>
@@ -84,6 +32,7 @@
<Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
<![CDATA[
]]>
</Environment>
<Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="">
@@ -125,6 +74,7 @@
<Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
<![CDATA[
]]>
</Environment>
<Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="">
@@ -163,6 +113,7 @@
<General OutputFile="$(IntermediateDirectory)/$(ProjectName)" IntermediateDirectory="./Release" Command="./$(ProjectName)" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes"/>
<Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
<![CDATA[
]]>
</Environment>
<Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="">
@@ -204,6 +155,7 @@
<Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
<![CDATA[
]]>
</Environment>
<Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="">
@@ -237,4 +189,60 @@
<Dependencies Name="Debug_WIN"/>
<Dependencies Name="Release"/>
<Dependencies Name="Release_WIN"/>
<VirtualDirectory Name="Frame">
<File Name="cosmosGUI.h"/>
<File Name="cosmos.fbp"/>
<File Name="cosmosGUI.cpp"/>
<File Name="cosmos.cpp"/>
<File Name="main.cpp"/>
<File Name="cosmos.h"/>
<VirtualDirectory Name="icons">
<File Name="icons/correc.xpm"/>
<File Name="icons/export.xpm"/>
<File Name="icons/import.xpm"/>
<File Name="icons/optionsgales.xpm"/>
<File Name="icons/optionsrche.xpm"/>
<File Name="icons/play.xpm"/>
</VirtualDirectory>
</VirtualDirectory>
<VirtualDirectory Name="Dialogs">
<VirtualDirectory Name="correc">
<File Name="correc.cpp"/>
<File Name="correc.fbp"/>
<File Name="correc.h"/>
<File Name="correcGUI.cpp"/>
<File Name="correcGUI.h"/>
</VirtualDirectory>
<VirtualDirectory Name="options">
<File Name="options.cpp"/>
<File Name="options.fbp"/>
<File Name="options.h"/>
<File Name="optionsGUI.cpp"/>
<File Name="optionsGUI.h"/>
</VirtualDirectory>
<VirtualDirectory Name="optionsRche">
<File Name="optionsRche.cpp"/>
<File Name="optionsRche.fbp"/>
<File Name="optionsRche.h"/>
<File Name="optionsRcheGUI.cpp"/>
<File Name="optionsRcheGUI.h"/>
</VirtualDirectory>
<VirtualDirectory Name="resultats">
<File Name="resultats.cpp"/>
<File Name="resultats.fbp"/>
<File Name="resultats.h"/>
<File Name="resultatsGUI.cpp"/>
<File Name="resultatsGUI.h"/>
</VirtualDirectory>
</VirtualDirectory>
<VirtualDirectory Name="Objects">
<File Name="bdd.h"/>
<File Name="config.h"/>
<File Name="misc.h"/>
<File Name="recherche.h"/>
<File Name="bdd.cpp"/>
<File Name="config.cpp"/>
<File Name="misc.cpp"/>
<File Name="recherche.cpp"/>
</VirtualDirectory>
</CodeLite_Project>

+ 8
- 0
CosMoS/bdd.h View File

@@ -24,12 +24,18 @@ class class_bdd
public:
class_bdd(const wxString& path_in, wxGrid* grid);
~class_bdd();
// import/export
void importer(const wxString& filename);
void exporter(const wxString& filename);
// mise à jour de la grille
void updategrid();
// modification des booléens de publi
void modresultbool(const wxString& id, int col, const wxString& val);
// gestion des corrections
int nbcorrections();
wxString* getcorrecorig();
wxString* getcorrecdest();
@@ -37,12 +43,14 @@ class class_bdd
void modcorrection(const wxString& orig, const wxString& dest);
void delcorrection(const wxString& orig);
// gestion des résultats
int nbresult(const wxString& id);
void modnbresult(const wxString& id, int nbresults);
wxArrayString getidresult(const wxString& id, bool stripped=false);
void setidresult(const wxString& id, wxArrayString idresult);
void addidresult(const wxString& id, const wxString& idresult);
// gestion des publis
bool publiexists(const wxString& id);
void addpubli(wxString id, wxString titre, wxString auteurs, wxString abstract, wxString revue, wxString lien, wxString date);
wxArrayString getpubli(wxString id);


+ 1
- 3
CosMoS/config.cpp View File

@@ -15,7 +15,7 @@ void config::createDefault()
proxyurl = "www-proxy.chu-nancy.fr";
proxyport = 8080;
rule defaultrule = {"defaut", true, true, true, true, AND, AND, AND, delai, true, true, 5, 2, true, "Nancy", false, "", 20};
rule defaultrule = {"defaut", true, true, true, true, AND, AND, AND, true, true, 2, 5, true, "Nancy", false, "", 20};
ruleset.push_back(defaultrule);
first_time = true;
@@ -65,7 +65,6 @@ void config::addsettoxml(wxXmlNode* setlistnode, rule toadd)
opsnode->AddAttribute("responsable", op2W(toadd.opresponsable)); // ops_responsable
setnode->AddChild(opsnode);
wxXmlNode* datesnode = new wxXmlNode(NULL, wxXML_ELEMENT_NODE, "dates");// dates
datesnode->AddAttribute("type", type2W(toadd.type_date)); // dates_type
datesnode->AddAttribute("usedebut", bool2W(toadd.usedebut)); // dates_usedebut
datesnode->AddAttribute("debut", _itoW(toadd.debut)); // dates_debut
datesnode->AddAttribute("usefin", bool2W(toadd.usefin)); // dates_usefin
@@ -112,7 +111,6 @@ void config::load()
currentrule.opboth = W2op(parcours->GetAttribute("both")); // ops_both
currentrule.opresponsable = W2op(parcours->GetAttribute("responsable"));// ops_responsable
parcours = parcours->GetNext(); // dates
currentrule.type_date = W2type(parcours->GetAttribute("type")); // dates_type
currentrule.usedebut = W2bool(parcours->GetAttribute("usedebut")); // dates_usedebut
currentrule.debut = wxAtoi(parcours->GetAttribute("debut")); // dates_debut
currentrule.usefin = W2bool(parcours->GetAttribute("usefin")); // dates_usefin


+ 0
- 2
CosMoS/config.h View File

@@ -15,7 +15,6 @@ typedef struct trule
bool inuse;
bool usedemandeur, useresponsable, useconsultant;
int opdemandeur, opboth, opresponsable;
int type_date;
bool usedebut, usefin;
int debut, fin;
bool useville;
@@ -33,7 +32,6 @@ protected:
bool useproxy;
wxString proxyurl;
int proxyport;
//TODO : option pour cacher les lignes identifiées
vector<rule> ruleset;
void createDefault();


+ 0
- 19
CosMoS/misc.cpp View File

@@ -35,25 +35,6 @@ int W2op(wxString in)
return AND;
}

wxString type2W(int in)
{
switch (in)
{
case delai: return "delai"; break;
case dates: return "dates"; break;
default: return "delai"; break;
};
}

int W2type(wxString in)
{
if (in == "delai")
return delai;
else if (in == "dates")
return dates;
return delai;
}

wxDateTime int2date(int in)
{
wxDateTime out;


+ 0
- 8
CosMoS/misc.h View File

@@ -19,18 +19,10 @@ enum
OR=1,
};

enum
{
delai = 0,
dates = 1
};

wxString bool2W(bool in);
bool W2bool(wxString in);
wxString op2W(int in);
int W2op(wxString in);
wxString type2W(int in);
int W2type(wxString in);
wxDateTime int2date(int in);
int date2int(wxDateTime in);



+ 14
- 60
CosMoS/optionsRche.cpp View File

@@ -32,23 +32,12 @@ void optionsRche::OnChecklistSelect( wxCommandEvent& event )
radio_both->SetSelection(currentrule.opboth);
radio_responsable->SetSelection(currentrule.opresponsable);
radio_delai->SetValue(!currentrule.type_date);
radio_dates->SetValue(currentrule.type_date);
checkbox_debut->SetValue(currentrule.usedebut);
checkbox_fin->SetValue(currentrule.usefin);
if (currentrule.type_date == delai)
{
spinctrl_debut->SetValue(currentrule.debut);
spinctrl_fin->SetValue(currentrule.fin);
}
else
{
datepicker_debut->SetValue(int2date(currentrule.debut));
datepicker_fin->SetValue(int2date(currentrule.fin));
}
spinctrl_debut->SetValue(currentrule.debut);
spinctrl_fin->SetValue(currentrule.fin);
checkbox_ville->SetValue(currentrule.useville);
textctrl_ville->SetValue(currentrule.ville);
@@ -71,19 +60,10 @@ void optionsRche::OnAdd( wxCommandEvent& event )
toadd.opdemandeur = radio_demandeur->GetSelection();
toadd.opboth = radio_both->GetSelection();
toadd.opresponsable = radio_responsable->GetSelection();
toadd.type_date = radio_dates->GetValue();
toadd.usedebut = checkbox_debut->GetValue();
toadd.usefin = checkbox_fin->GetValue();
if (radio_dates->GetValue())
{
toadd.debut = date2int(datepicker_debut->GetValue());
toadd.fin = date2int(datepicker_fin->GetValue());
}
else
{
toadd.debut = spinctrl_debut->GetValue();
toadd.fin = spinctrl_fin->GetValue();
}
toadd.debut = spinctrl_debut->GetValue();
toadd.fin = spinctrl_fin->GetValue();
toadd.useville = checkbox_ville->GetValue();
toadd.ville = textctrl_ville->GetValue();
toadd.usesuppl = checkbox_suppl->GetValue();
@@ -137,19 +117,10 @@ void optionsRche::OnUpdate( wxCommandEvent& event )
tomod.opdemandeur = radio_demandeur->GetSelection();
tomod.opboth = radio_both->GetSelection();
tomod.opresponsable = radio_responsable->GetSelection();
tomod.type_date = radio_dates->GetValue();
tomod.usedebut = checkbox_debut->GetValue();
tomod.usefin = checkbox_fin->GetValue();
if (radio_dates->GetValue())
{
tomod.debut = date2int(datepicker_debut->GetValue());
tomod.fin = date2int(datepicker_fin->GetValue());
}
else
{
tomod.debut = spinctrl_debut->GetValue();
tomod.fin = spinctrl_fin->GetValue();
}
tomod.debut = spinctrl_debut->GetValue();
tomod.fin = spinctrl_fin->GetValue();
tomod.useville = checkbox_ville->GetValue();
tomod.ville = textctrl_ville->GetValue();
tomod.usesuppl = checkbox_suppl->GetValue();
@@ -196,33 +167,16 @@ void optionsRche::updateGUI( wxCommandEvent& event )
else
radio_both->Disable();
if (radio_delai->GetValue())
{
datepicker_debut->Disable();
datepicker_fin->Disable();
if (checkbox_debut->IsChecked())
spinctrl_debut->Enable();
else
spinctrl_debut->Disable();
if (checkbox_fin->IsChecked())
spinctrl_fin->Enable();
else
spinctrl_fin->Disable();
}
if (checkbox_debut->IsChecked())
spinctrl_debut->Enable();
else
{
spinctrl_debut->Disable();
if (checkbox_fin->IsChecked())
spinctrl_fin->Enable();
else
spinctrl_fin->Disable();
if (checkbox_debut->IsChecked())
datepicker_debut->Enable();
else
datepicker_debut->Disable();
if (checkbox_fin->IsChecked())
datepicker_fin->Enable();
else
datepicker_fin->Disable();
}

if (checkbox_suppl->IsChecked())
textctrl_suppl->Enable();
else


+ 7
- 241
CosMoS/optionsRche.fbp View File

@@ -1012,141 +1012,17 @@
<property name="flag">wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxFlexGridSizer" expanded="1">
<property name="cols">3</property>
<property name="cols">2</property>
<property name="flexible_direction">wxBOTH</property>
<property name="growablecols">1,2</property>
<property name="growablecols">1</property>
<property name="growablerows"></property>
<property name="hgap">0</property>
<property name="minimum_size"></property>
<property name="name">sizer_dates</property>
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
<property name="permission">none</property>
<property name="rows">3</property>
<property name="rows">2</property>
<property name="vgap">0</property>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="spacer" expanded="0">
<property name="height">0</property>
<property name="permission">protected</property>
<property name="width">0</property>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxRadioButton" expanded="0">
<property name="bg"></property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Delai</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">radio_delai</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style">wxRB_GROUP</property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="value">1</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRadioButton">updateGUI</event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxRadioButton" expanded="0">
<property name="bg"></property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Dates</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">radio_dates</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="value">0</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRadioButton">updateGUI</event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND</property>
@@ -1217,7 +1093,7 @@
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="initial">5</property>
<property name="initial">2</property>
<property name="max">100</property>
<property name="maximum_size"></property>
<property name="min">0</property>
@@ -1233,7 +1109,7 @@
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="value">5</property>
<property name="value">2</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
@@ -1264,61 +1140,6 @@
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxDatePickerCtrl" expanded="0">
<property name="bg"></property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="enabled">0</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">datepicker_debut</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style">wxDP_DROPDOWN</property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnDateChanged"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND</property>
@@ -1389,7 +1210,7 @@
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="initial">2</property>
<property name="initial">5</property>
<property name="max">100</property>
<property name="maximum_size"></property>
<property name="min">0</property>
@@ -1405,7 +1226,7 @@
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="value">2</property>
<property name="value">5</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
@@ -1436,61 +1257,6 @@
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxDatePickerCtrl" expanded="0">
<property name="bg"></property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="enabled">0</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">datepicker_fin</property>
<property name="permission">protected</property>
<property name="pos"></property>
<property name="size"></property>
<property name="style">wxDP_DROPDOWN</property>
<property name="subclass"></property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChar"></event>
<event name="OnDateChanged"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
</object>
</object>
<object class="sizeritem" expanded="0">


+ 5
- 30
CosMoS/optionsRcheGUI.cpp View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Sep 8 2010)
// C++ code generated with wxFormBuilder (version Sep 15 2010)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
@@ -77,7 +77,7 @@ dialog_optionsRche::dialog_optionsRche( wxWindow* parent, wxWindowID id, const w
wxString radio_demandeurChoices[] = { wxT("AND"), wxT("OR") };
int radio_demandeurNChoices = sizeof( radio_demandeurChoices ) / sizeof( wxString );
radio_demandeur = new wxRadioBox( this, wxID_ANY, wxT("Nom(s) demandeur(s)"), wxDefaultPosition, wxDefaultSize, radio_demandeurNChoices, radio_demandeurChoices, 1, wxRA_SPECIFY_COLS );
radio_demandeur->SetSelection( 0 );
radio_demandeur->SetSelection( 1 );
sizer_noms->Add( radio_demandeur, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
wxString radio_bothChoices[] = { wxT("AND"), wxT("OR") };
@@ -102,46 +102,25 @@ dialog_optionsRche::dialog_optionsRche( wxWindow* parent, wxWindowID id, const w
sizer_set->Add( staticline2, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
wxFlexGridSizer* sizer_dates;
sizer_dates = new wxFlexGridSizer( 3, 3, 0, 0 );
sizer_dates = new wxFlexGridSizer( 2, 2, 0, 0 );
sizer_dates->AddGrowableCol( 1 );
sizer_dates->AddGrowableCol( 2 );
sizer_dates->SetFlexibleDirection( wxBOTH );
sizer_dates->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
sizer_dates->Add( 0, 0, 1, wxEXPAND, 5 );
radio_delai = new wxRadioButton( this, wxID_ANY, wxT("Delai"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
radio_delai->SetValue( true );
sizer_dates->Add( radio_delai, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
radio_dates = new wxRadioButton( this, wxID_ANY, wxT("Dates"), wxDefaultPosition, wxDefaultSize, 0 );
sizer_dates->Add( radio_dates, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
checkbox_debut = new wxCheckBox( this, wxID_ANY, wxT("Date début"), wxDefaultPosition, wxDefaultSize, 0 );
checkbox_debut->SetValue(true);
sizer_dates->Add( checkbox_debut, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
spinctrl_debut = new wxSpinCtrl( this, wxID_ANY, wxT("5"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 100, 5 );
spinctrl_debut = new wxSpinCtrl( this, wxID_ANY, wxT("2"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 100, 2 );
sizer_dates->Add( spinctrl_debut, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
datepicker_debut = new wxDatePickerCtrl( this, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_DROPDOWN );
datepicker_debut->Enable( false );
sizer_dates->Add( datepicker_debut, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
checkbox_fin = new wxCheckBox( this, wxID_ANY, wxT("Date fin"), wxDefaultPosition, wxDefaultSize, 0 );
checkbox_fin->SetValue(true);
sizer_dates->Add( checkbox_fin, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
spinctrl_fin = new wxSpinCtrl( this, wxID_ANY, wxT("2"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 100, 2 );
spinctrl_fin = new wxSpinCtrl( this, wxID_ANY, wxT("5"), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 100, 5 );
sizer_dates->Add( spinctrl_fin, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
datepicker_fin = new wxDatePickerCtrl( this, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_DROPDOWN );
datepicker_fin->Enable( false );
sizer_dates->Add( datepicker_fin, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
sizer_set->Add( sizer_dates, 0, wxEXPAND, 5 );
staticline3 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
@@ -217,8 +196,6 @@ dialog_optionsRche::dialog_optionsRche( wxWindow* parent, wxWindowID id, const w
bouton_del->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( dialog_optionsRche::OnDel ), NULL, this );
checkbox_demandeur->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( dialog_optionsRche::updateGUI ), NULL, this );
checkbox_responsable->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( dialog_optionsRche::updateGUI ), NULL, this );
radio_delai->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( dialog_optionsRche::updateGUI ), NULL, this );
radio_dates->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( dialog_optionsRche::updateGUI ), NULL, this );
checkbox_debut->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( dialog_optionsRche::updateGUI ), NULL, this );
checkbox_fin->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( dialog_optionsRche::updateGUI ), NULL, this );
checkbox_ville->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( dialog_optionsRche::updateGUI ), NULL, this );
@@ -237,8 +214,6 @@ dialog_optionsRche::~dialog_optionsRche()
bouton_del->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( dialog_optionsRche::OnDel ), NULL, this );
checkbox_demandeur->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( dialog_optionsRche::updateGUI ), NULL, this );
checkbox_responsable->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( dialog_optionsRche::updateGUI ), NULL, this );
radio_delai->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( dialog_optionsRche::updateGUI ), NULL, this );
radio_dates->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( dialog_optionsRche::updateGUI ), NULL, this );
checkbox_debut->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( dialog_optionsRche::updateGUI ), NULL, this );
checkbox_fin->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( dialog_optionsRche::updateGUI ), NULL, this );
checkbox_ville->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( dialog_optionsRche::updateGUI ), NULL, this );


+ 1
- 9
CosMoS/optionsRcheGUI.h View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Sep 8 2010)
// C++ code generated with wxFormBuilder (version Sep 15 2010)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
@@ -21,10 +21,7 @@
#include <wx/statline.h>
#include <wx/checkbox.h>
#include <wx/radiobox.h>
#include <wx/radiobut.h>
#include <wx/spinctrl.h>
#include <wx/datectrl.h>
#include <wx/dateevt.h>
#include <wx/statbox.h>
#include <wx/dialog.h>

@@ -54,15 +51,10 @@ class dialog_optionsRche : public wxDialog
wxRadioBox* radio_responsable;
wxCheckBox* checkbox_consultant;
wxStaticLine* staticline2;
wxRadioButton* radio_delai;
wxRadioButton* radio_dates;
wxCheckBox* checkbox_debut;
wxSpinCtrl* spinctrl_debut;
wxDatePickerCtrl* datepicker_debut;
wxCheckBox* checkbox_fin;
wxSpinCtrl* spinctrl_fin;
wxDatePickerCtrl* datepicker_fin;
wxStaticLine* staticline3;
wxCheckBox* checkbox_ville;
wxTextCtrl* textctrl_ville;


+ 12
- 10
CosMoS/recherche.cpp View File

@@ -311,19 +311,21 @@ wxString class_recherche::build(int row, rule regle)
requete << "&retmax=" << _itoW(regle.retmax);
if (regle.usefin)
if ((regle.usedebut) || (regle.usefin))
{
requete << "&datetype=pdat&mindate=";
wxDateTime temp;
if (regle.type_date == dates)
temp = int2date(regle.fin);
if (regle.type_date == delai)
{
temp.ParseFormat(grid->GetCellValue(row, 12), "%d/%m/%Y");
temp.ParseFormat(grid->GetCellValue(row, 12), "%d/%m/%Y");
requete << "&datetype=pdat";
if (regle.usedebut)
temp += wxDateSpan(regle.debut);
requete << "&mindate=" << temp.Format("%Y/%m/%d");
temp.ParseFormat(grid->GetCellValue(row, 12), "%d/%m/%Y");
if (regle.usefin)
temp += wxDateSpan(regle.fin);
}
requete << temp.Format("%Y/%m/%d");
temp.SetToCurrent();
else
temp.SetToCurrent();
requete << "&maxdate=" << temp.Format("%Y/%m/%d");
}


+ 1
- 0
Sante_Pub.workspace View File

@@ -15,6 +15,7 @@
]]>
</Environment>
<BuildMatrix>


+ 2
- 33
Sante_Pub.workspace.session View File

@@ -1,39 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Session Name="/home/satamaxx/Programmes/Sante_Pub/Sante_Pub.workspace">
<int Value="3" Name="m_selectedTab"/>
<int Value="0" Name="m_selectedTab"/>
<wxString Value="/home/satamaxx/Programmes/Sante_Pub/Sante_Pub.workspace" Name="m_workspaceName"/>
<TabInfoArray Name="TabInfoArray">
<TabInfo>
<wxString Value="/home/satamaxx/Programmes/Sante_Pub/CosMoS/cosmos.cpp" Name="FileName"/>
<int Value="78" Name="FirstVisibleLine"/>
<int Value="98" Name="CurrentLine"/>
<wxArrayString Name="Bookmarks"/>
</TabInfo>
<TabInfo>
<wxString Value="/home/satamaxx/Programmes/Sante_Pub/CosMoS/resultats.h" Name="FileName"/>
<int Value="0" Name="FirstVisibleLine"/>
<int Value="0" Name="CurrentLine"/>
<wxArrayString Name="Bookmarks"/>
</TabInfo>
<TabInfo>
<wxString Value="/home/satamaxx/Programmes/Sante_Pub/CosMoS/resultats.cpp" Name="FileName"/>
<int Value="24" Name="FirstVisibleLine"/>
<int Value="41" Name="CurrentLine"/>
<wxArrayString Name="Bookmarks"/>
</TabInfo>
<TabInfo>
<wxString Value="/home/satamaxx/Programmes/Sante_Pub/CosMoS/bdd.cpp" Name="FileName"/>
<int Value="0" Name="FirstVisibleLine"/>
<int Value="7" Name="CurrentLine"/>
<wxArrayString Name="Bookmarks"/>
</TabInfo>
<TabInfo>
<wxString Value="/home/satamaxx/Programmes/Sante_Pub/CosMoS/bdd.h" Name="FileName"/>
<int Value="0" Name="FirstVisibleLine"/>
<int Value="42" Name="CurrentLine"/>
<wxArrayString Name="Bookmarks"/>
</TabInfo>
</TabInfoArray>
<TabInfoArray Name="TabInfoArray"/>
<SerializedObject Name="m_breakpoints">
<long Value="0" Name="Count"/>
</SerializedObject>


Write Preview
Loading…
Cancel
Save