Merge pull request #99 from moleculemaker/sort-by-atom-count

feat: allow sorting by Number of Atoms
moleculemaker · Feb 22, 2024 · 435f935 · 435f935
2 parents 7032e94 + 900f13d
commit 435f935
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/app/api/mmli-backend/v1/model/molecule.ts b/src/app/api/mmli-backend/v1/model/molecule.ts
@@ -3,17 +3,18 @@
  * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
  *
  * The version of the OpenAPI document: 0.1.0
- * 
+ *
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
 
 
-export interface Molecule { 
+export interface Molecule {
     id: number;
     flagged: boolean;
+    atom_count: number;
     doc_no: string;
     file_path: string;
     page_no: string;

diff --git a/src/app/components/chemscraper/results/results.component.ts b/src/app/components/chemscraper/results/results.component.ts
@@ -95,6 +95,7 @@ export class ResultsComponent {
     this.sortOptions = [
       { label: 'Location In PDF (default)', value: 'Location In PDF', disabled: false },
       { label: 'Molecular Weight', value: 'Molecular Weight', disabled: false },
+      { label: 'Number of Atoms', value: 'Number of Atoms', disabled: false },
       { label: 'Occurrences', value: 'Occurrences', disabled: false },
       { label: 'Similarity', value: 'Similarity', disabled: true }
     ];
@@ -466,6 +467,13 @@ export class ResultsComponent {
         }
         return data2.id - data1.id;
       });
+    } else if(value == "Number of Atoms") {
+      this.molecules.sort((data1: Molecule, data2: Molecule) => {
+        if (this.isAscending) {
+          return data1.atom_count - data2.atom_count;
+        }
+        return data2.atom_count - data1.atom_count;
+      });
     } else if (value == "Molecular Weight") {
       this.molecules.sort((data1: Molecule, data2: Molecule) => {
         if(!data2.molecularWeight || data2.molecularWeight == 'Unavailable'){