Ticket #8757 (closed: fixed)

Opened 7 years ago

Last modified 5 years ago

Add investigation number field to search form

Reported by: Jay Rainey Owned by: Jay Rainey
Priority: critical Milestone: Release 3.1
Component: Framework Keywords: ICAT
Cc: Blocked By:
Blocking: Tester: Peter Parker

Description

Owen noted that:

"Scientists would like to search using investigation numbers".

To do this, I will need to:

  1. Add a new form element in CatalogSearch.ui
  2. Update getSearchFields method in CatalogSearch.cpp to account for new form element.
  3. Add a related getter/setter method to CatalogSearchParam.
  4. Add new property to CatalogSearch algorithm.
  5. Add new check to buildSearchQuery in ICat4Catalog.
  6. Update ICat3Catalog to also work accordingly.

As users want to search using investigation Number, it may also be worth while showing it in the investigation table results. (Currently it's hidden for usability purposes, but if it's useful for scientists it would be worthwhile showing it).

Change History

comment:1 Changed 7 years ago by Jay Rainey

  • Status changed from new to inprogress
Last edited 7 years ago by Jay Rainey (previous) (diff)

comment:2 Changed 7 years ago by Jay Rainey

Last edited 7 years ago by Jay Rainey (previous) (diff)

comment:3 Changed 7 years ago by Jay Rainey

Last edited 7 years ago by Jay Rainey (previous) (diff)

comment:4 Changed 7 years ago by Jay Rainey

Last edited 7 years ago by Jay Rainey (previous) (diff)

comment:5 Changed 7 years ago by Jay Rainey

Update icat4 search query. Refs #8757.

Changeset: bd060ee7823a1e6808679d51cf86308bd7a83600

comment:6 Changed 7 years ago by Jay Rainey

Forgot to add tooltip to form element. Refs #8757.

Changeset: 45a1c18b066d0342db34df1e88837db2185490cb

comment:7 Changed 7 years ago by Jay Rainey

Merge branch 'feature/8757_icat_add_invs_num_to_search' into develop. Refs #8757.

Conflicts:

  • Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/CatalogSearch.ui

Changeset: aebd24fc3b3136bfdc29f7dcb76d5ef2e8bdcc88

comment:8 Changed 7 years ago by Jay Rainey

Display investigation ID column. Refs #8757.

  • I did not auto expand the GUI as the user may not have a high-res screen.

Changeset: 5193e05f581cc55931121b133ba61fcdd8b5c009

comment:9 Changed 7 years ago by Jay Rainey

  • Status changed from inprogress to verify
  • Resolution set to fixed
Last edited 7 years ago by Jay Rainey (previous) (diff)

comment:10 Changed 7 years ago by Peter Parker

  • Status changed from verify to verifying
  • Tester set to Peter Parker

comment:11 Changed 7 years ago by Peter Parker

  • Status changed from verifying to reopened
  • Resolution fixed deleted

There's merge conflict that needs fixing:

CONFLICT (content): Merge conflict in Code/Mantid/MantidQt/MantidWidgets/inc/MantidQtMantidWidgets/CatalogSearch.ui Automatic merge failed; fix conflicts and then commit the result.

comment:12 Changed 7 years ago by Jay Rainey

  • Status changed from reopened to inprogress
Last edited 7 years ago by Jay Rainey (previous) (diff)

comment:13 Changed 7 years ago by Jay Rainey

Last edited 7 years ago by Jay Rainey (previous) (diff)

comment:14 Changed 7 years ago by Jay Rainey

  • Priority changed from major to critical

comment:15 Changed 7 years ago by Jay Rainey

  • Status changed from inprogress to verify
  • Resolution set to fixed

This ticket dealt with added a new form element to the catalog search GUI that enables users to search using the investigation ID of an investigation.

To test

  1. Log into the catalog via the catalog menu (Catalog -> Login).
  2. Open the Catalog Search GUI. You will see the new Investigation id: label and related input field.
  3. Enter an investigation id into the corresponding field, for example, 1390019.
  4. Click Search and the investigation with this ID should be displayed in the Search Results table.

You can use the ICAT web interface TOPCAT to verify that the correct investigation is returned.

Last edited 7 years ago by Jay Rainey (previous) (diff)

comment:16 Changed 7 years ago by Peter Parker

  • Status changed from verify to verifying

comment:17 Changed 7 years ago by Peter Parker

  • Status changed from verifying to reopened
  • Resolution fixed deleted

Unfortunately this will not build locally for me now. Compiler output:

2>.../Build/Mantid - Test/MantidQt/MantidWidgets\ui_CatalogSearch.h(827): error C2039: 'setToolTip' : is not a member of 'QGridLayout' (inc\MantidQtMantidWidgets\moc_CatalogSearch.cxx)
2>          ...\source\mantid\code\third_party\include\qt-4.8.4\include\qtgui\../../src/gui/kernel/qgridlayout.h(60) : see declaration of 'QGridLayout'
2>.../Build/Mantid - Test/MantidQt/MantidWidgets\ui_CatalogSearch.h(827): error C2039: 'setToolTip' : is not a member of 'QGridLayout' (...\Source\Mantid\Code\Mantid\MantidQt\MantidWidgets\src\CatalogSearch.cpp)
2>          ...\source\mantid\code\third_party\include\qt-4.8.4\include\qtgui\../../src/gui/kernel/qgridlayout.h(60) : see declaration of 'QGridLayout'

The following change to CatalogSearch.ui is causing the error. We seem to be deleting the "Advanced Search" checkbox, but leaving behind its tooltip entry:

 -          <item row="5" column="0">
 -           <widget class="QCheckBox" name="advSearchCbox">
              <property name="toolTip">
               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Check to view additional search options.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
 -            <property name="text">
 -             <string>Advanced search</string>
 -            </property>
 -           </widget>
 -          </item>

I think something has gone wrong with the merge.

comment:18 Changed 7 years ago by Jay Rainey

  • Status changed from reopened to inprogress

Add investigationId form element to catalog GUI. Refs #8757.

Changeset: 3966212d48749e09ad0dd5efb4296dcedf50527f

comment:19 Changed 7 years ago by Jay Rainey

Add setters/getters to catalogSearchParam for invesId. Refs #8757.

Changeset: 617c25d81e95bb0d5b1c4250a275750e9e22ce4e

comment:20 Changed 7 years ago by Jay Rainey

Add new property to catalogSearch algorithm. Refs #8757.

Changeset: 2f649f6feaa7c37ecfcc9665d2abe367455aae9a

comment:21 Changed 7 years ago by Jay Rainey

Pass the input from the interface to the algorithm. Refs #8757.

  • Also hide related error message icon.

Changeset: 5c945f44b6d47d08e2c45b2dbf29e05c36428ab5

comment:22 Changed 7 years ago by Jay Rainey

Update icat4 search query. Refs #8757.

Changeset: abd317253283a8fa1b8f7e0689165f2bedacf098

comment:23 Changed 7 years ago by Jay Rainey

Display investigation ID column. Refs #8757.

  • I did not auto expand the GUI as the user may not have a high-res screen.

Changeset: 51e2a10a73969372207061c69d0e7e271b789618

comment:24 Changed 7 years ago by Jay Rainey

Move investigation id field above advanced elements. Refs #8757.

Changeset: 2ae1f9280f8c4b431f68782384a5d07d69c83bbc

comment:25 Changed 7 years ago by Jay Rainey

Add investigationId form element to catalog GUI. Refs #8757.

Changeset: 3966212d48749e09ad0dd5efb4296dcedf50527f

comment:26 Changed 7 years ago by Jay Rainey

Add setters/getters to catalogSearchParam for invesId. Refs #8757.

Changeset: 617c25d81e95bb0d5b1c4250a275750e9e22ce4e

comment:27 Changed 7 years ago by Jay Rainey

Add new property to catalogSearch algorithm. Refs #8757.

Changeset: 2f649f6feaa7c37ecfcc9665d2abe367455aae9a

comment:28 Changed 7 years ago by Jay Rainey

Pass the input from the interface to the algorithm. Refs #8757.

  • Also hide related error message icon.

Changeset: 5c945f44b6d47d08e2c45b2dbf29e05c36428ab5

comment:29 Changed 7 years ago by Jay Rainey

Update icat4 search query. Refs #8757.

Changeset: abd317253283a8fa1b8f7e0689165f2bedacf098

comment:30 Changed 7 years ago by Jay Rainey

Display investigation ID column. Refs #8757.

  • I did not auto expand the GUI as the user may not have a high-res screen.

Changeset: 51e2a10a73969372207061c69d0e7e271b789618

comment:31 Changed 7 years ago by Jay Rainey

Move investigation id field above advanced elements. Refs #8757.

Changeset: 2ae1f9280f8c4b431f68782384a5d07d69c83bbc

comment:32 Changed 7 years ago by Jay Rainey

Merge branch 'feature/8757_icat_add_inves' into develop. Refs #8757

Changeset: c94cdfff7aa6d9966be3bf28c96dcb88958c6c2b

comment:33 Changed 7 years ago by Jay Rainey

  • Status changed from inprogress to verify
  • Resolution set to fixed

comment:34 Changed 7 years ago by Peter Parker

  • Status changed from verify to verifying

comment:35 Changed 7 years ago by Peter Parker

  • Status changed from verifying to closed

Merge remote-tracking branch 'origin/feature/8757_icat_add_investigation_num_search'

Full changeset: 41e38ab4bfd88c90634f75a8d3a6a78dc5f3c18b

comment:36 Changed 5 years ago by Stuart Campbell

This ticket has been transferred to github issue 9601

Note: See TracTickets for help on using tickets.