Merge pull request #109 from amfoss/develop

Develop

Author: hrideshmg

.github/dependabot.yml

@@ -3,4 +3,11 @@ updates:
   - package-ecosystem: "cargo"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
+    open-pull-requests-limit: 1
+    target-branch: "develop"
+    groups:
+      all-dependencies:
+        applies-to: [version-updates, security-updates]
+        patterns:
+          - "*"

src/graphql/queries/attendance_queries.rs

@@ -30,7 +30,7 @@ impl AttendanceQueries {
 
         let records = sqlx::query_as::<_, AttendanceWithMember>(
             "SELECT att.attendance_id, att.member_id, att.date, att.is_present,
-                    att.time_in, att.time_out, mem.name, mem.year
+                    att.time_in, att.time_out, mem.name, mem.year, mem.group_id
              FROM Attendance att
              JOIN Member mem ON att.member_id = mem.member_id
              WHERE att.date = $1",

src/models/attendance.rs

@@ -56,4 +56,5 @@ pub struct AttendanceWithMember {
     pub time_out: Option<NaiveTime>,
     pub name: String,
     pub year: i32,
+    pub group_id: i32,
 }