Browse Source

Added a filter on the attendance page

AlexMin 5 months ago
parent
commit
d97e3d729c

BIN
EducationDepartment/.vs/EducationDepartment/FileContentIndex/2874263c-31ff-4409-8f7d-2f58755d01e4.vsidx → EducationDepartment/.vs/EducationDepartment/FileContentIndex/1444fe23-bb10-4c56-b58c-99463879f426.vsidx


BIN
EducationDepartment/.vs/EducationDepartment/v17/.suo


+ 2 - 90
EducationDepartment/.vs/EducationDepartment/v17/DocumentLayout.json

@@ -1,100 +1,12 @@
 {
   "Version": 1,
   "WorkspaceRootPath": "D:\\UP_Educ\\Educational\\EducationDepartment\\",
-  "Documents": [
-    {
-      "AbsoluteMoniker": "D:0:0:{DA6E3BB7-64F8-4697-BB4C-75B5E9D9B592}|EducationDepartment\\EducationDepartment.csproj|d:\\up_educ\\educational\\educationdepartment\\educationdepartment\\views\\disciplines.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}",
-      "RelativeMoniker": "D:0:0:{DA6E3BB7-64F8-4697-BB4C-75B5E9D9B592}|EducationDepartment\\EducationDepartment.csproj|solutionrelative:educationdepartment\\views\\disciplines.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{DA6E3BB7-64F8-4697-BB4C-75B5E9D9B592}|EducationDepartment\\EducationDepartment.csproj|d:\\up_educ\\educational\\educationdepartment\\educationdepartment\\views\\timetable.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}",
-      "RelativeMoniker": "D:0:0:{DA6E3BB7-64F8-4697-BB4C-75B5E9D9B592}|EducationDepartment\\EducationDepartment.csproj|solutionrelative:educationdepartment\\views\\timetable.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{DA6E3BB7-64F8-4697-BB4C-75B5E9D9B592}|EducationDepartment\\EducationDepartment.csproj|d:\\up_educ\\educational\\educationdepartment\\educationdepartment\\views\\profilestudent.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}",
-      "RelativeMoniker": "D:0:0:{DA6E3BB7-64F8-4697-BB4C-75B5E9D9B592}|EducationDepartment\\EducationDepartment.csproj|solutionrelative:educationdepartment\\views\\profilestudent.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{DA6E3BB7-64F8-4697-BB4C-75B5E9D9B592}|EducationDepartment\\EducationDepartment.csproj|d:\\up_educ\\educational\\educationdepartment\\educationdepartment\\views\\attendance.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}",
-      "RelativeMoniker": "D:0:0:{DA6E3BB7-64F8-4697-BB4C-75B5E9D9B592}|EducationDepartment\\EducationDepartment.csproj|solutionrelative:educationdepartment\\views\\attendance.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{DA6E3BB7-64F8-4697-BB4C-75B5E9D9B592}|EducationDepartment\\EducationDepartment.csproj|d:\\up_educ\\educational\\educationdepartment\\educationdepartment\\views\\profileteacher.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}",
-      "RelativeMoniker": "D:0:0:{DA6E3BB7-64F8-4697-BB4C-75B5E9D9B592}|EducationDepartment\\EducationDepartment.csproj|solutionrelative:educationdepartment\\views\\profileteacher.axaml||{6D5344A2-2FCD-49DE-A09D-6A14FD1B1224}"
-    }
-  ],
+  "Documents": [],
   "DocumentGroupContainers": [
     {
       "Orientation": 0,
       "VerticalTabListWidth": 256,
-      "DocumentGroups": [
-        {
-          "DockedWidth": 922,
-          "SelectedChildIndex": 0,
-          "Children": [
-            {
-              "$type": "Document",
-              "DocumentIndex": 0,
-              "Title": "Disciplines.axaml",
-              "DocumentMoniker": "D:\\UP_Educ\\Educational\\EducationDepartment\\EducationDepartment\\Views\\Disciplines.axaml",
-              "RelativeDocumentMoniker": "EducationDepartment\\Views\\Disciplines.axaml",
-              "ToolTip": "D:\\UP_Educ\\Educational\\EducationDepartment\\EducationDepartment\\Views\\Disciplines.axaml",
-              "RelativeToolTip": "EducationDepartment\\Views\\Disciplines.axaml",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|",
-              "WhenOpened": "2024-05-27T14:23:34.922Z",
-              "EditorCaption": ""
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 1,
-              "Title": "TimeTable.axaml",
-              "DocumentMoniker": "D:\\UP_Educ\\Educational\\EducationDepartment\\EducationDepartment\\Views\\TimeTable.axaml",
-              "RelativeDocumentMoniker": "EducationDepartment\\Views\\TimeTable.axaml",
-              "ToolTip": "D:\\UP_Educ\\Educational\\EducationDepartment\\EducationDepartment\\Views\\TimeTable.axaml",
-              "RelativeToolTip": "EducationDepartment\\Views\\TimeTable.axaml",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|",
-              "WhenOpened": "2024-05-27T14:20:20.127Z",
-              "EditorCaption": ""
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 3,
-              "Title": "Attendance.axaml",
-              "DocumentMoniker": "D:\\UP_Educ\\Educational\\EducationDepartment\\EducationDepartment\\Views\\Attendance.axaml",
-              "RelativeDocumentMoniker": "EducationDepartment\\Views\\Attendance.axaml",
-              "ToolTip": "D:\\UP_Educ\\Educational\\EducationDepartment\\EducationDepartment\\Views\\Attendance.axaml",
-              "RelativeToolTip": "EducationDepartment\\Views\\Attendance.axaml",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|",
-              "WhenOpened": "2024-05-27T14:20:16.033Z",
-              "EditorCaption": ""
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 4,
-              "Title": "ProfileTeacher.axaml",
-              "DocumentMoniker": "D:\\UP_Educ\\Educational\\EducationDepartment\\EducationDepartment\\Views\\ProfileTeacher.axaml",
-              "RelativeDocumentMoniker": "EducationDepartment\\Views\\ProfileTeacher.axaml",
-              "ToolTip": "D:\\UP_Educ\\Educational\\EducationDepartment\\EducationDepartment\\Views\\ProfileTeacher.axaml",
-              "RelativeToolTip": "EducationDepartment\\Views\\ProfileTeacher.axaml",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|",
-              "WhenOpened": "2024-05-27T14:05:45.249Z",
-              "EditorCaption": ""
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 2,
-              "Title": "ProfileStudent.axaml",
-              "DocumentMoniker": "D:\\UP_Educ\\Educational\\EducationDepartment\\EducationDepartment\\Views\\ProfileStudent.axaml",
-              "RelativeDocumentMoniker": "EducationDepartment\\Views\\ProfileStudent.axaml",
-              "ToolTip": "D:\\UP_Educ\\Educational\\EducationDepartment\\EducationDepartment\\Views\\ProfileStudent.axaml",
-              "RelativeToolTip": "EducationDepartment\\Views\\ProfileStudent.axaml",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003549|",
-              "WhenOpened": "2024-05-27T13:21:14.416Z",
-              "EditorCaption": ""
-            }
-          ]
-        }
-      ]
+      "DocumentGroups": []
     }
   ]
 }

+ 8 - 2
EducationDepartment/EducationDepartment/Views/Attendance.axaml

@@ -24,10 +24,16 @@
 			<StackPanel>
 				<TextBlock Text="Фильтр" Margin="0,10,0,10" HorizontalAlignment="Center" FontSize="14" Foreground="White"/>
 				<ComboBox SelectedIndex="0" Width="250" Height="5" Margin="0,0,0,0"  HorizontalAlignment="Center"  HorizontalContentAlignment="Center" VerticalContentAlignment="Center"  Foreground="White" Background="#09102A" BorderBrush="#4158AE" BorderThickness="2">
-					<ComboBoxItem>Студент 1</ComboBoxItem>
-					<ComboBoxItem>Группа 2</ComboBoxItem>
+					<ComboBoxItem>Группа</ComboBoxItem>
+					<ComboBoxItem>Студент</ComboBoxItem>
 					<ComboBoxItem>Дисциплина 3</ComboBoxItem>
 				</ComboBox>
+				<ComboBox SelectedIndex="0" Width="250" Height="5" Margin="0,0,0,0"  HorizontalAlignment="Center"  HorizontalContentAlignment="Center" VerticalContentAlignment="Center"  Foreground="White" Background="#09102A" BorderBrush="#4158AE" BorderThickness="2">
+					<ComboBoxItem>Вся группа</ComboBoxItem>
+					<ComboBoxItem>Студент 1</ComboBoxItem>
+					<ComboBoxItem>Студент 2</ComboBoxItem>
+					<ComboBoxItem>Студент 3</ComboBoxItem>
+				</ComboBox>
 				<Button Content="Показать" Width="100" Height="35" Margin="0,5,0,0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" HorizontalAlignment="Center" Foreground="White" Background="#4158AE"/>
 				<TextBlock Text="Дисциплина/Группа" Margin="150,0,0,10" HorizontalAlignment="Left" FontSize="14" Foreground="White"/>
 				<TextBlock Text="% посещаемости" Margin="0,-28,150,10" HorizontalAlignment="Right"  FontSize="14" Foreground="White"/>

+ 1 - 0
EducationDepartment/EducationDepartment/Views/Attendance.axaml.cs

@@ -10,4 +10,5 @@ public partial class Attendance : UserControl
     {
         InitializeComponent();
     }
+
 }