Complete documentation to previous functions

FACT-Team · Feb 9, 2015 · e4cdc33 · e4cdc33
1 parent b50d63b
commit e4cdc33
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 19 deletions.
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -172,7 +172,9 @@ void MainWindow::search(QString text)
     s.setGroupFilter(ui->gpbxSearchFilter->isChecked());
     s.setSearchInCompanies(ui->chkSearchCompany->isChecked());
     s.setSearchInReferentLastname(ui->chkReferentName->isChecked());
-   // s.setSearchInProjects(ui->c);
+    s.setSearchInProjects(ui->chkProjectName->isChecked());
+    s.setSearchInContributories(ui->chkContributory->isChecked());
+    s.setSearchInBillsQuotes(ui->chkBillQuote->isChecked());
     s.setText(text);
     updateTableCustomers(s.getFilter());
     updateTree(s.getFilter());
@@ -197,6 +199,9 @@ void MainWindow::search(QString text)
     s.setGroupFilter(ui->gpbxSearchFilter->isChecked());
     s.setSearchInCompanies(ui->chkSearchCompany->isChecked());
     s.setSearchInReferentLastname(ui->chkReferentName->isChecked());
+    s.setSearchInProjects(ui->chkProjectName->isChecked());
+    s.setSearchInContributories(ui->chkContributory->isChecked());
+    s.setSearchInBillsQuotes(ui->chkBillQuote->isChecked());
     s.setText(text);
     updateTableCustomers(s.getFilter());
     updateTree(s.getFilter());

diff --git a/src/mainwindow.ui b/src/mainwindow.ui
@@ -309,7 +309,7 @@
      <x>0</x>
      <y>0</y>
      <width>1237</width>
-     <height>27</height>
+     <height>20</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFichier">
@@ -364,7 +364,7 @@
    <property name="minimumSize">
     <size>
      <width>279</width>
-     <height>168</height>
+     <height>180</height>
     </size>
    </property>
    <property name="maximumSize">
@@ -446,6 +446,39 @@ border: 1px solid #bbb;</string>
           </property>
          </widget>
         </item>
+        <item row="2" column="0">
+         <widget class="QCheckBox" name="chkProjectName">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>Nom du projet</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="0">
+         <widget class="QCheckBox" name="chkContributory">
+          <property name="text">
+           <string>Nom de la prestation</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="0">
+         <widget class="QCheckBox" name="chkBillQuote">
+          <property name="text">
+           <string>N°,Nom du devis/facture</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </item>

diff --git a/src/models/search.cpp b/src/models/search.cpp
@@ -82,7 +82,7 @@ void Search::setText(const QString &text)
     _text = text;
     _text.replace("'", "''");
 }
-bool Search::searchInBillsQuotes() const
+bool Search::getSearchInBillsQuotes() const
 {
     return _searchInBillsQuotes;
 }

diff --git a/src/models/search.h b/src/models/search.h
@@ -31,7 +31,7 @@ class Search
      */
     bool getSearchInCompanies() const;
     /**
-     * @brief Search::setSearchInCompanies Modify the filter of search
+     * @brief Search::setSearchInCompanies Modify the filter of companies search
      * @param getSearchInCompanies Search in companies is concerned
      */
     void setSearchInCompanies(bool searchInCompanies);
@@ -43,41 +43,49 @@ class Search
      */
     bool getSearchInReferentLastname() const;
     /**
-     * @brief Search::setSearchInReferentLastname Modify the filter of search
-     * @param searchInReferentLastname Search in referent last name is concerned
+     * @brief Search::setSearchInReferentLastname Modify the filter of referents
+     * last name search
+     * @param searchInReferentLastname Search in referents last name which are
+     * concerned
      */
     void setSearchInReferentLastname(bool searchInReferentLastname);
 
     /**
-     * @brief Search::getSearchInProjects
-     * @return
+     * @brief Search::getSearchInProjects Return TRUE if it exists one or more
+     * projets in database
+     * @return boolean if project are existing
      */
     bool getSearchInProjects() const;
     /**
-     * @brief Search::setSearchInProjects
-     * @param searchInProjects
+     * @brief Search::setSearchInProjects Modify the filter of projects search
+     * @param searchInProjects Search in projects which are concerned
      */
     void setSearchInProjects(bool searchInProjects);
 
     /**
-     * @brief Search::getSearchInContributories
-     * @return
+     * @brief Search::getSearchInContributories  Return TRUE if it exists one or
+     *  more projets in database
+     * @return boolean if contributories are existing
      */
     bool searchInContributories() const;
     /**
-     * @brief Search::setSearchInContributories
-     * @param searchInContributories
+     * @brief Search::setSearchInContributories Modify the filter of
+     * contributories search
+     * @param searchInContributories Search in contributories which are
+     * concerned
      */
     void setSearchInContributories(bool searchInContributories);
 
     /**
-     * @brief Search::searchInBillsQuotes
-     * @return
+     * @brief Search::searchInBillsQuotes Return TRUE if it exists one or more
+     * bills or quotes in database
+     * @return boolean if bills or quotes are existing
      */
     bool getSearchInBillsQuotes() const;
     /**
-     * @brief Search::setSearchInBillsQuotes
-     * @param searchInBillsQuotes
+     * @brief Search::setSearchInBillsQuotes Modify the filter of bills and
+     * quotes search
+     * @param searchInBillsQuotes Search in bills or quotes which are concerned
      */
     void setSearchInBillsQuotes(bool searchInBillsQuotes);