Properly display running entries as a table

1 files changed, 11 insertions, 3 deletions

diff --git a/src/db.rs b/src/db.rs
index 198ce03..5b165c9 100644
--- a/src/db.rs
+++ b/src/db.rs
@@ -241,16 +241,24 @@ pub fn get_raw_data_keys(conn: &PgConnection) -> Result<Vec<models::RawDataKey>,
     Ok(rows)
 }
 
-pub fn get_entries(conn: &PgConnection, username: &str) -> Result<Vec<models::Entry>, Error> {
+pub fn get_entries(
+    conn: &PgConnection,
+    username: &str,
+    entry_type: &str,
+) -> Result<Vec<models::Entry>, Error> {
     use crate::schema::entries;
     let r = entries::table
-        .filter(entries::username.eq(username))
+        .filter(
+            entries::username
+                .eq(username)
+                .and(entries::entry_type.eq(entry_type)),
+        )
         .get_results::<models::Entry>(conn)?;
     Ok(r)
 }
 
 pub fn get_template(
-    conn: &PgConnection,
+    _conn: &PgConnection,
     entry_type: &str,
 ) -> Result<template::TemplateSpec, Error> {
     match entry_type {