0.07

完成计算模块， 1）现在需要把所有东西拼起来， 2）最后添加查询功能
molata · Sep 29, 2016 · 2e093cc · 2e093cc
1 parent b85a084
commit 2e093cc
Show file tree

Hide file tree

Showing 72 changed files with 284 additions and 46 deletions.
diff --git a/Admin_Actor/Admin_Actor.lvlib b/Admin_Actor/Admin_Actor.lvlib
@@ -9,14 +9,16 @@
 	</Item>
 	<Item Name="Messages for this Actor" Type="Folder"/>
 	<Item Name="Model" Type="Folder">
-		<Item Name="CalAttendance.lvclass" Type="LVClass" URL="../CalAttendance/CalAttendance.lvclass"/>
+		<Item Name="AttendRecord.lvclass" Type="LVClass" URL="../Models/Attendance Record/AttendRecord.lvclass"/>
 		<Item Name="ExcelReader.lvclass" Type="LVClass" URL="../Models/ExcelReader/ExcelReader.lvclass"/>
 		<Item Name="ListSelection.lvclass" Type="LVClass" URL="../Models/ListSelection/ListSelection.lvclass"/>
 		<Item Name="MemberAttendance.lvclass" Type="LVClass" URL="../Models/MemberAttendance/MemberAttendance.lvclass"/>
 	</Item>
 	<Item Name="Panel" Type="Folder">
+		<Item Name="Handle Attendance.vi" Type="VI" URL="../Panels/Handle Attendance.vi"/>
 		<Item Name="Handle ExcuseNotes.vi" Type="VI" URL="../Panels/Handle ExcuseNotes.vi"/>
 	</Item>
 	<Item Name="Admin_Actor.lvclass" Type="LVClass" URL="../Admin_Actor/Admin_Actor.lvclass"/>
+	<Item Name="CalAttendance.lvclass" Type="LVClass" URL="../CalAttendance/CalAttendance.lvclass"/>
 	<Item Name="ExcuseNotesHandler.lvclass" Type="LVClass" URL="../ExcuseNotes/ExcuseNotesHandler.lvclass"/>
 </Library>
diff --git a/Admin_Actor/Admin_Actor/Admin_Actor.lvclass b/Admin_Actor/Admin_Actor/Admin_Actor.lvclass
diff --git a/Admin_Actor/CalAttendance/CalAttendance.lvclass b/Admin_Actor/CalAttendance/CalAttendance.lvclass
diff --git a/Admin_Actor/CalAttendance/Core.vi b/Admin_Actor/CalAttendance/Core.vi
diff --git a/Admin_Actor/CalAttendance/Data Accessors/Set Database.vi b/Admin_Actor/CalAttendance/Data Accessors/Set Database.vi
diff --git a/Admin_Actor/CalAttendance/Public Methods/Add Member Actual Attendance To Dict.vi b/Admin_Actor/CalAttendance/Public Methods/Add Member Actual Attendance To Dict.vi
diff --git a/Admin_Actor/CalAttendance/Public Methods/Cal Attendance.vi b/Admin_Actor/CalAttendance/Public Methods/Cal Attendance.vi
diff --git a/Admin_Actor/CalAttendance/Public Methods/Cal Curent Week.vi b/Admin_Actor/CalAttendance/Public Methods/Cal Curent Week.vi
diff --git a/Admin_Actor/CalAttendance/Public Methods/Check If Date Is Fit.vi b/Admin_Actor/CalAttendance/Public Methods/Check If Date Is Fit.vi
diff --git a/Admin_Actor/CalAttendance/Public Methods/Display Attendance Result(UI).vi b/Admin_Actor/CalAttendance/Public Methods/Display Attendance Result(UI).vi
diff --git a/Admin_Actor/CalAttendance/Public Methods/Get Deparment Members.vi b/Admin_Actor/CalAttendance/Public Methods/Get Deparment Members.vi
diff --git a/Admin_Actor/CalAttendance/Public Methods/Get Departments.vi b/Admin_Actor/CalAttendance/Public Methods/Get Departments.vi
diff --git a/Admin_Actor/CalAttendance/Type Definitions/Main Ctls and VI Refs.ctl b/Admin_Actor/CalAttendance/Type Definitions/Main Ctls and VI Refs.ctl
diff --git a/Admin_Actor/CalAttendance/Type Definitions/NumOfAttendace.ctl b/Admin_Actor/CalAttendance/Type Definitions/NumOfAttendace.ctl
diff --git a/Admin_Actor/CalAttendance/Type Definitions/Sign_Attendance.ctl b/Admin_Actor/CalAttendance/Type Definitions/Sign_Attendance.ctl
diff --git a/Admin_Actor/CalAttendance/UnitTest/Assert Cal Attendance.vi b/Admin_Actor/CalAttendance/UnitTest/Assert Cal Attendance.vi
diff --git a/Admin_Actor/CalAttendance/UnitTest/Assert Excel.vi b/Admin_Actor/CalAttendance/UnitTest/Assert Excel.vi
diff --git a/Admin_Actor/ExcuseNotes/ExcuseNotesHandler.lvclass b/Admin_Actor/ExcuseNotes/ExcuseNotesHandler.lvclass
diff --git a/Admin_Actor/ExcuseNotes/Private Methods/Check If Has ExcuseNote.vi b/Admin_Actor/ExcuseNotes/Private Methods/Check If Has ExcuseNote.vi
diff --git a/Admin_Actor/ExcuseNotes/Public Methods/Commit To Database.vi b/Admin_Actor/ExcuseNotes/Public Methods/Commit To Database.vi
diff --git a/Admin_Actor/ExcuseNotes/Public Methods/Convert To 2D Array.vi b/Admin_Actor/ExcuseNotes/Public Methods/Convert To 2D Array.vi
diff --git a/Admin_Actor/ExcuseNotes/Public Methods/QueryExcuseContent.vi b/Admin_Actor/ExcuseNotes/Public Methods/QueryExcuseContent.vi
diff --git a/Admin_Actor/ExcuseNotes/UnitTest/Assert Commit 2D Array.vi b/Admin_Actor/ExcuseNotes/UnitTest/Assert Commit 2D Array.vi
diff --git a/Admin_Actor/Models/Attendance Record/AttendRecord.lvclass b/Admin_Actor/Models/Attendance Record/AttendRecord.lvclass
diff --git a/Admin_Actor/Models/Attendance Record/Data Accessors/Get Res_Attendance.vi b/Admin_Actor/Models/Attendance Record/Data Accessors/Get Res_Attendance.vi
diff --git a/Admin_Actor/Models/Attendance Record/Data Accessors/Set Mmeber Info.vi b/Admin_Actor/Models/Attendance Record/Data Accessors/Set Mmeber Info.vi
diff --git a/Admin_Actor/CalAttendance/Acquire Data.vi → ...nce Record/Public Methods/Acquire Data.vi b/Admin_Actor/CalAttendance/Acquire Data.vi → ...nce Record/Public Methods/Acquire Data.vi
diff --git a/Admin_Actor/Models/Attendance Record/Public Methods/Cal Attendance.vi b/Admin_Actor/Models/Attendance Record/Public Methods/Cal Attendance.vi
diff --git a/Admin_Actor/Models/Attendance Record/Public Methods/Count Attendance Result.vi b/Admin_Actor/Models/Attendance Record/Public Methods/Count Attendance Result.vi
diff --git a/Admin_Actor/Models/Attendance Record/UnitTest/Assert Cal Attendance Result.vi b/Admin_Actor/Models/Attendance Record/UnitTest/Assert Cal Attendance Result.vi
diff --git a/Admin_Actor/Models/Attendance Record/UnitTest/Assert Class Serialize.vi b/Admin_Actor/Models/Attendance Record/UnitTest/Assert Class Serialize.vi
diff --git a/Admin_Actor/Models/ExcelReader/Core.vi b/Admin_Actor/Models/ExcelReader/Core.vi
diff --git a/Admin_Actor/Models/ExcelReader/ExcelReader.lvclass b/Admin_Actor/Models/ExcelReader/ExcelReader.lvclass
@@ -63,6 +63,17 @@
 			<Property Name="NI.ClassItem.State" Type="Int">1082130960</Property>
 		</Item>
 	</Item>
+	<Item Name="Public Methods" Type="Folder">
+		<Item Name="Check AttendanceTable If Correct.vi" Type="VI" URL="../Public Methods/Check AttendanceTable If Correct.vi">
+			<Property Name="NI.ClassItem.ConnectorPane" Type="Bin">&amp;1#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!'0!!!!$1!-1#%'=X2B&gt;(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&amp;!!!Q!!!!%!!AFF=H*P=C"P&gt;81!"!!!!""!)1J';81I2G&amp;M=W5J!!"!1(!!(A!!*R&amp;":'VJ&lt;F^"9X2P=CZM&gt;GRJ9B.&amp;?'.F&lt;&amp;*F972F=CZM&gt;G.M98.T!!^&amp;?'.F&lt;&amp;*F972F=C"P&gt;81!%5!$!!J$&gt;8*8:76L+$!J!!!A1&amp;!!!Q!!!!%!!B.F=H*P=C"J&lt;C!I&lt;G]A:8*S&lt;X)J!":!-0````].5WBF:82/97VF+#)C+1!/1$,`````"&amp;"B&gt;'A!!%"!=!!?!!!H%5&amp;E&lt;7FO8U&amp;D&gt;'^S,GRW&lt;'FC%U6Y9W6M5G6B:'6S,GRW9WRB=X-!$E6Y9W6M5G6B:'6S)'FO!!"B!0!!$!!$!!1!"1!'!!1!"!!(!!1!#!!*!!I!#Q-!!(A!!!U)!!!!!!!!#1!!!!U,!!!!!!!!!!!!!!A!!!!!!!!!#A!!!B!!!!!1!!!!#!!!$1!!!!Q!!!!!!!!!!!!!!1!-!!!!!!</Property>
+			<Property Name="NI.ClassItem.ExecutionSystem" Type="Int">-1</Property>
+			<Property Name="NI.ClassItem.Flags" Type="Int">0</Property>
+			<Property Name="NI.ClassItem.IsStaticMethod" Type="Bool">true</Property>
+			<Property Name="NI.ClassItem.MethodScope" Type="UInt">1</Property>
+			<Property Name="NI.ClassItem.Priority" Type="Int">1</Property>
+			<Property Name="NI.ClassItem.State" Type="Int">1342710288</Property>
+		</Item>
+	</Item>
 	<Item Name="UnitTest" Type="Folder">
 		<Item Name="Assert ExcelReader Core.vi" Type="VI" URL="../UnitTest/Assert ExcelReader Core.vi">
 			<Property Name="NI.ClassItem.ConnectorPane" Type="Bin">&amp;1#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!"A!!!!!A!%!!!!6!$Q!!Q!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!$!!"Y!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!1!"!!!!!!</Property>

diff --git a/Admin_Actor/Models/ExcelReader/Private Methods/Cal Time If Fit.vi b/Admin_Actor/Models/ExcelReader/Private Methods/Cal Time If Fit.vi
diff --git a/Admin_Actor/Models/ExcelReader/Public Methods/Check AttendanceTable If Correct.vi b/Admin_Actor/Models/ExcelReader/Public Methods/Check AttendanceTable If Correct.vi
diff --git a/Admin_Actor/Models/ExcelReader/Public Methods/Convert Excel To 2D Data.vi b/Admin_Actor/Models/ExcelReader/Public Methods/Convert Excel To 2D Data.vi
diff --git a/Admin_Actor/Models/ExcelReader/Public Methods/Get Excel All Sheetnames.vi b/Admin_Actor/Models/ExcelReader/Public Methods/Get Excel All Sheetnames.vi
diff --git a/Admin_Actor/Models/ExcelReader/Public Methods/MemberAttendance Factory.vi b/Admin_Actor/Models/ExcelReader/Public Methods/MemberAttendance Factory.vi
diff --git a/Admin_Actor/Models/ExcelReader/UnitTest/Assert Check Attendance Table If Exit.vi b/Admin_Actor/Models/ExcelReader/UnitTest/Assert Check Attendance Table If Exit.vi
diff --git a/Admin_Actor/Models/ExcelReader/g_variable/g_Excel Attributes.vi b/Admin_Actor/Models/ExcelReader/g_variable/g_Excel Attributes.vi
diff --git a/Admin_Actor/Models/MemberAttendance/Data Accessors/Get AttendanceData.vi b/Admin_Actor/Models/MemberAttendance/Data Accessors/Get AttendanceData.vi
diff --git a/Admin_Actor/Models/MemberAttendance/Data Accessors/Get Department.vi b/Admin_Actor/Models/MemberAttendance/Data Accessors/Get Department.vi
diff --git a/Admin_Actor/Models/MemberAttendance/MemberAttendance.lvclass b/Admin_Actor/Models/MemberAttendance/MemberAttendance.lvclass
diff --git a/Admin_Actor/Models/MemberAttendance/Private Methods/Convert Time To Attendance Result.vi b/Admin_Actor/Models/MemberAttendance/Private Methods/Convert Time To Attendance Result.vi
diff --git a/Admin_Actor/Models/MemberAttendance/Public Methods/Cal Attendance.vi b/Admin_Actor/Models/MemberAttendance/Public Methods/Cal Attendance.vi
diff --git a/Admin_Actor/Models/MemberAttendance/UnitTest/Assert cal Attendance.vi b/Admin_Actor/Models/MemberAttendance/UnitTest/Assert cal Attendance.vi
diff --git a/Admin_Actor/Panels/Handle Attendance.vi b/Admin_Actor/Panels/Handle Attendance.vi
diff --git a/Admin_Actor/Panels/Handle ExcuseNotes.vi b/Admin_Actor/Panels/Handle ExcuseNotes.vi
diff --git a/Admin_Actor/Setting/g_setting.vi b/Admin_Actor/Setting/g_setting.vi
diff --git a/CRTManageSystem.lvlps b/CRTManageSystem.lvlps
@@ -1,3 +1,3 @@
 [ProjectWindow_Data]
-ProjectExplorer.ClassicPosition[String] = "240,456,914,892"
+ProjectExplorer.ClassicPosition[String] = "293,1211,967,1647"
 
diff --git a/CRTManageSystem.lvproj b/CRTManageSystem.lvproj
@@ -56,6 +56,8 @@
 			<Item Name="LaunchUserSystem.vi" Type="VI" URL="../Test/LaunchUserSystem.vi"/>
 		</Item>
 		<Item Name="User.lib" Type="Folder">
+			<Item Name="Convert TimeString To TimeStamp(HH_MM_SS).vi" Type="VI" URL="../User.lib/Convert TimeString To TimeStamp(HH_MM_SS).vi"/>
+			<Item Name="Convert TimeString To TimeStamp(YYYY_MM_DD).vi" Type="VI" URL="../User.lib/Convert TimeString To TimeStamp(YYYY_MM_DD).vi"/>
 			<Item Name="Convert Variant To Value.vi" Type="VI" URL="../User.lib/Convert Variant To Value.vi"/>
 			<Item Name="Get 2D Array Element.vi" Type="VI" URL="../User.lib/Get 2D Array Element.vi"/>
 		</Item>
@@ -110,6 +112,10 @@
 				<Item Name="Not Found Dialog.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Not Found Dialog.vi"/>
 				<Item Name="Search and Replace Pattern.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Search and Replace Pattern.vi"/>
 				<Item Name="Set Bold Text.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Set Bold Text.vi"/>
+				<Item Name="Set Busy.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/cursorutil.llb/Set Busy.vi"/>
+				<Item Name="Set Cursor (Cursor ID).vi" Type="VI" URL="/&lt;vilib&gt;/Utility/cursorutil.llb/Set Cursor (Cursor ID).vi"/>
+				<Item Name="Set Cursor (Icon Pict).vi" Type="VI" URL="/&lt;vilib&gt;/Utility/cursorutil.llb/Set Cursor (Icon Pict).vi"/>
+				<Item Name="Set Cursor.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/cursorutil.llb/Set Cursor.vi"/>
 				<Item Name="Set String Value.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Set String Value.vi"/>
 				<Item Name="Simple Error Handler.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Simple Error Handler.vi"/>
 				<Item Name="Space Constant.vi" Type="VI" URL="/&lt;vilib&gt;/dlg_ctls.llb/Space Constant.vi"/>
@@ -118,6 +124,7 @@
 				<Item Name="Three Button Dialog.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Three Button Dialog.vi"/>
 				<Item Name="Time-Delay Override Options.ctl" Type="VI" URL="/&lt;vilib&gt;/ActorFramework/Time-Delayed Send Message/Time-Delay Override Options.ctl"/>
 				<Item Name="Trim Whitespace.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Trim Whitespace.vi"/>
+				<Item Name="Unset Busy.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/cursorutil.llb/Unset Busy.vi"/>
 				<Item Name="VariantType.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/VariantDataType/VariantType.lvlib"/>
 				<Item Name="whitespace.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/whitespace.ctl"/>
 			</Item>

diff --git a/Database/CRTDatabase.accdb b/Database/CRTDatabase.accdb
diff --git a/Database/CRTTimeTable.xlsx b/Database/CRTTimeTable.xlsx
diff --git a/Database/Date_Excel/Public Methods/Convert Excel Cell To Hour_Min String.vi b/Database/Date_Excel/Public Methods/Convert Excel Cell To Hour_Min String.vi
diff --git a/Database/Date_Excel/UnitTest/Assert Convert Time To Hour_Min.vi b/Database/Date_Excel/UnitTest/Assert Convert Time To Hour_Min.vi
diff --git a/Database/考勤报表.xls b/Database/考勤报表.xls
diff --git a/Member_Actor/ExcuseNote/Data Accessors/New ExcuseNote.vi b/Member_Actor/ExcuseNote/Data Accessors/New ExcuseNote.vi
diff --git a/Member_Actor/ExcuseNote/Data Accessors/Set Database.vi b/Member_Actor/ExcuseNote/Data Accessors/Set Database.vi
diff --git a/Member_Actor/ExcuseNote/ExcuseNote.lvclass b/Member_Actor/ExcuseNote/ExcuseNote.lvclass
diff --git a/Member_Actor/ExcuseNote/Public Methods/Commit Excuse Note.vi b/Member_Actor/ExcuseNote/Public Methods/Commit Excuse Note.vi
diff --git a/Member_Actor/ExcuseNote/Public Methods/Commit To Database.vi b/Member_Actor/ExcuseNote/Public Methods/Commit To Database.vi
diff --git a/Member_Actor/ExcuseNote/UnitTest/Assert ExcuseNote.vi b/Member_Actor/ExcuseNote/UnitTest/Assert ExcuseNote.vi
diff --git a/Member_Actor/ExcuseNote/g_TypeDefinitions/g_Excuse_Column_Titles.vi b/Member_Actor/ExcuseNote/g_TypeDefinitions/g_Excuse_Column_Titles.vi
diff --git a/Member_Actor/MemberTable/Init MemberTable.vi b/Member_Actor/MemberTable/Init MemberTable.vi
diff --git a/...ble/Public Methods/Check If Has Course.vi → ...ic Methods/Convert Courses To 2D Array.vi b/...ble/Public Methods/Check If Has Course.vi → ...ic Methods/Convert Courses To 2D Array.vi
diff --git a/Member_Actor/MemberTable/TimeTable.lvclass b/Member_Actor/MemberTable/TimeTable.lvclass
@@ -31,7 +31,7 @@
 	</Item>
 	<Item Name="Data Accessors" Type="Folder"/>
 	<Item Name="Public Methods" Type="Folder">
-		<Item Name="Check If Has Course.vi" Type="VI" URL="../Public Methods/Check If Has Course.vi">
+		<Item Name="Convert Courses To 2D Array.vi" Type="VI" URL="../Public Methods/Convert Courses To 2D Array.vi">
 			<Property Name="NI.ClassItem.ConnectorPane" Type="Bin">&amp;1#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!&amp;X!!!!$!!-1#%'=X2B&gt;(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&amp;!!!Q!!!!%!!AFF=H*P=C"P&gt;81!"!!!!!J!-0````]":A!71%!!!P``````````!!5&amp;18*S98E!0E"Q!"Y!!#93476N9G6S8U&amp;D&gt;'^S,GRW&lt;'FC%62J&lt;76597*M:3ZM&gt;G.M98.T!!!.6'FN:62B9GRF)'^V&gt;!!A1&amp;!!!Q!!!!%!!B.F=H*P=C"J&lt;C!I&lt;G]A:8*S&lt;X)J!"&amp;!!Q!+1X6S6W6F;SAQ+1!!0E"Q!"Y!!#93476N9G6S8U&amp;D&gt;'^S,GRW&lt;'FC%62J&lt;76597*M:3ZM&gt;G.M98.T!!!-6'FN:62B9GRF)'FO!!"B!0!!$!!$!!1!"A!(!!1!"!!%!!1!#!!%!!E!#A-!!(A!!!U)!!!!!!!!#1!!!!U,!!!!!!!!!!!!!!!!!!!!!!!!#!!!!!!!!!!)!!!!#!!!$1!!!!Q!!!!!!!!!!!!!!1!,!!!!!!</Property>
 			<Property Name="NI.ClassItem.ExecutionSystem" Type="Int">-1</Property>
 			<Property Name="NI.ClassItem.Flags" Type="Int">0</Property>

diff --git a/Member_Actor/MemberTable/UnitTest/Assert Check If Has course.vi b/Member_Actor/MemberTable/UnitTest/Assert Check If Has course.vi
diff --git a/Member_Actor/Member_Actor/New MemberController.vi b/Member_Actor/Member_Actor/New MemberController.vi
diff --git a/Member_Actor/Member_Actor/Public Methods/PanelFactory.vi b/Member_Actor/Member_Actor/Public Methods/PanelFactory.vi
diff --git a/Member_Actor/SubPanel/ExcuseNote_Panel.vi b/Member_Actor/SubPanel/ExcuseNote_Panel.vi
diff --git a/User.lib/Convert TimeString To TimeStamp(HH_MM_SS).vi b/User.lib/Convert TimeString To TimeStamp(HH_MM_SS).vi
diff --git a/User.lib/Convert TimeString To TimeStamp(YYYY_MM_DD).vi b/User.lib/Convert TimeString To TimeStamp(YYYY_MM_DD).vi