Changeset 15 for trunk/Modules

Timestamp:

Nov 15, 2012, 12:34:33 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Doplněno zobrazení formuláře pro úpravu všech tabulek docházky.

Location:

trunk/Modules/Attendance

Files:

• UModuleAttendance.lfm (modified) (1 diff)
• UModuleAttendance.lrt (added)
• UModuleAttendance.pas (modified) (16 diffs)

trunk/Modules/Attendance/UModuleAttendance.lfm

@@ -5 +5 @@
   VerticalOffset = 238
   Width = 380
+  object ActionList1: TActionList
+    Images = FormMain.ImageList1
+    left = 300
+    top = 104
+    object AReadFromTerminal: TAction
+      Caption = 'Read from terminal'
+      Hint = 'Read new data from terminal'
+      OnExecute = AReadFromTerminalExecute
+    end
+  end
 end

trunk/Modules/Attendance/UModuleAttendance.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, UModularSystem, UFormList, UFormEdit, Controls,
-  SpecializedList, Forms;
+  SpecializedList, Forms, ActnList, UDataModel;
 
 type
+
+  { TDataModuleAttendance }
+
   TDataModuleAttendance = class(TDataModule)
+    AReadFromTerminal: TAction;
+    ActionList1: TActionList;
+    procedure AReadFromTerminalExecute(Sender: TObject);
   private
     { private declarations }
@@ -21 +27 @@
   TModuleAttendance = class(TModule)
   private
-    DataViewLists: TListObject;
-    DataViewForms: TListObject;
+    ModelLog: TDataModel;
+    ViewFormLog: TDataViewForm;
+    ViewListLog: TDataViewList;
+    ModelTerminal: TDataModel;
+    ViewFormTerminal: TDataViewForm;
+    ViewListTerminal: TDataViewList;
+    ModelOperation: TDataModel;
+    ViewFormOperation: TDataViewForm;
+    ViewListOperation: TDataViewList;
+    ModelAttendance: TDataModel;
+    ViewFormAttendance: TDataViewForm;
+    ViewListAttendance: TDataViewList;
+    ModelHoliday: TDataModel;
+    ViewFormHoliday: TDataViewForm;
+    ViewListHoliday: TDataViewList;
+    ModelPassage: TDataModel;
+    ViewFormPassage: TDataViewForm;
+    ViewListPassage: TDataViewList;
+    ModelUser: TDataModel;
+    ViewFormUser: TDataViewForm;
+    ViewListUser: TDataViewList;
     procedure InitModels;
   protected
@@ -74 +99 @@
   SLog = 'Log';
 
+{ TDataModuleAttendance }
+
+procedure TDataModuleAttendance.AReadFromTerminalExecute(Sender: TObject);
+begin
+
+end;
+
 
 { TModuleAttendance }
@@ -81 +113 @@
   NewDataView: TDataViewList;
   NewDataView2: TDataViewForm;
-begin
-  NewDataView := TDataViewList.Create;
-  with NewDataView do begin
+  NewModel: TDataModel;
+begin
+  ModelUser := TDataModel.Create;
+  with ModelUser do begin
+    with Items do begin
+      AddItem(SEnabled, 'Enabled', dtBoolean);
+      AddItem(SPersonalId, 'PersonalId', dtString);
+      AddItem(SLogin, 'Login', dtString);
+      AddItem(SPassword, 'Password', dtString);
+      AddItem(SFirstName, 'FirstName', dtString);
+      AddItem(SSecondName, 'SecondName', dtString);
+      AddItem(SCardCode, 'CardCode', dtString);
+      AddItem(SFingerPrint, 'FingerPrint', dtString);
+      AddItem(SNote, 'Note', dtText);
+    end;
+    Name := 'User';
+    Caption := SUser;
+  end;
+  ViewListUser := TDataViewList.Create;
+  with ViewListUser do begin
     with Columns do begin
       AddItem(SEnabled, 'Enabled', True, 30);
@@ -99 +148 @@
     ImageIndex := 9;
   end;
-  DataViewLists.Add(NewDataView);
-  FormMain.RegisterDataViewList(NewDataView);
-  NewDataView2 := TDataViewForm.Create;
-  with NewDataView2 do begin
+  FormMain.RegisterDataViewList(ViewListUser);
+  ViewFormUser := TDataViewForm.Create;
+  with ViewFormUser do begin
     Name := 'User';
     Caption := SUser;
@@ -117 +165 @@
     end;
   end;
-  DataViewForms.Add(NewDataView2);
-  FormMain.RegisterDataViewForm(NewDataView2);
-
-  NewDataView := TDataViewList.Create;
-  with NewDataView do begin
+  FormMain.RegisterDataViewForm(ViewFormUser);
+
+  ViewListPassage := TDataViewList.Create;
+  with ViewListPassage do begin
     with Columns do begin
       AddItem(STime, 'Time', True, 150);
@@ -132 +179 @@
     ImageIndex := 12;
   end;
-  DataViewLists.Add(NewDataView);
-  FormMain.RegisterDataViewList(NewDataView);
-  NewDataView2 := TDataViewForm.Create;
-  with NewDataView2 do begin
+  FormMain.RegisterDataViewList(ViewListPassage);
+  ViewFormPassage := TDataViewForm.Create;
+  with ViewFormPassage do begin
     with Items do begin
       AddItem(STime, 'Time', ctDate, True, Bounds(0, 0, 1, 1));
@@ -149 +195 @@
     ImageIndex := 12;
   end;
-  DataViewForms.Add(NewDataView2);
-  FormMain.RegisterDataViewForm(NewDataView2);
-
-  NewDataView := TDataViewList.Create;
-  with NewDataView do begin
+  FormMain.RegisterDataViewForm(ViewFormPassage);
+
+  ViewListAttendance := TDataViewList.Create;
+  with ViewListAttendance do begin
     with Columns do begin
       AddItem(SDate, 'Date', True, 80);
@@ -164 +209 @@
     ImageIndex := 14;
   end;
-  DataViewLists.Add(NewDataView);
-  FormMain.RegisterDataViewList(NewDataView);
-  NewDataView2 := TDataViewForm.Create;
-  with NewDataView2 do begin
+  FormMain.RegisterDataViewList(ViewListAttendance);
+  ViewFormAttendance := TDataViewForm.Create;
+  with ViewFormAttendance do begin
     with Items do begin
       AddItem(SUser, 'User', ctReference, True, Bounds(1, 0, 1, 1));
@@ -178 +222 @@
     ImageIndex := 14;
   end;
-  DataViewForms.Add(NewDataView2);
-  FormMain.RegisterDataViewForm(NewDataView2);
-
-  NewDataView := TDataViewList.Create;
-  with NewDataView do begin
+  FormMain.RegisterDataViewForm(ViewFormAttendance);
+
+  ViewListHoliday := TDataViewList.Create;
+  with ViewListHoliday do begin
     with Columns do begin
       AddItem(SEnabled, 'Enabled', True, 30);
@@ -194 +237 @@
     ImageIndex := 10;
   end;
-  DataViewLists.Add(NewDataView);
-  FormMain.RegisterDataViewList(NewDataView);
-
-  NewDataView := TDataViewList.Create;
-  with NewDataView do begin
+  FormMain.RegisterDataViewList(ViewListHoliday);
+  ViewFormHoliday := TDataViewForm.Create;
+  with ViewFormHoliday do begin
+    with Items do begin
+      AddItem(SEnabled, 'Enabled', ctCheckBox, True, Bounds(1, 0, 1, 1));
+      AddItem(SName, 'Name', ctEdit, True, Bounds(3, 0, 1, 1));
+      AddItem(SDay, 'Day', ctSpinEdit, True, Bounds(1, 1, 1, 1));
+      AddItem(SMonth, 'Month', ctSpinEdit, True, Bounds(3, 1, 1, 1));
+      AddItem(SYear, 'Year', ctSpinEdit, True, Bounds(1, 2, 1, 1));
+    end;
+    Name := 'Holiday';
+    Caption := SHoliday;
+    ImageIndex := 10;
+  end;
+  FormMain.RegisterDataViewForm(ViewFormHoliday);
+
+  ViewListOperation := TDataViewList.Create;
+  with ViewListOperation do begin
     with Columns do begin
       AddItem(SName, 'Name', True, 100);
@@ -207 +263 @@
     ImageIndex := 13;
   end;
-  DataViewLists.Add(NewDataView);
-  FormMain.RegisterDataViewList(NewDataView);
-
-  NewDataView := TDataViewList.Create;
-  with NewDataView do begin
+  FormMain.RegisterDataViewList(ViewListOperation);
+  ViewFormOperation := TDataViewForm.Create;
+  with ViewFormOperation do begin
+    with Items do begin
+      AddItem(SName, 'Name', ctEdit, True, Bounds(1, 0, 1, 1));
+      AddItem(SKeyNumber, 'KeyId', ctEdit, True, Bounds(3, 0, 1, 1));
+    end;
+    Name := 'Operation';
+    Caption := SOperation;
+    ImageIndex := 13;
+  end;
+  FormMain.RegisterDataViewForm(ViewFormOperation);
+
+  ViewListTerminal := TDataViewList.Create;
+  with ViewListTerminal do begin
     with Columns do begin
       AddItem(SName, 'Name', True, 80);
@@ -224 +290 @@
     ImageIndex := 8;
   end;
-  DataViewLists.Add(NewDataView);
-  FormMain.RegisterDataViewList(NewDataView);
-
-  NewDataView := TDataViewList.Create;
-  with NewDataView do begin
+  FormMain.RegisterDataViewList(ViewListTerminal);
+  ViewFormTerminal := TDataViewForm.Create;
+  with ViewFormTerminal do begin
+    with Items do begin
+      AddItem(SName, 'Name', ctEdit, True, Bounds(1, 0, 1, 1));
+      AddItem(SEnabled, 'Enabled', ctCheckBox, True, Bounds(3, 0, 1, 1));
+      AddItem(SAddress, 'Address', ctEdit, True, Bounds(1, 1, 1, 1));
+      AddItem(SPort, 'Port', ctSpinEdit, True, Bounds(3, 1, 1, 1));
+      AddItem(SType, 'Type', ctComboBox, True, Bounds(1, 2, 1, 1));
+      AddItem(SNote, 'Note', ctMemo, True, Bounds(3, 2, 1, 1));
+    end;
+    Name := 'Terminal';
+    Caption := STerminal;
+    ImageIndex := 8;
+  end;
+  FormMain.RegisterDataViewForm(ViewFormTerminal);
+
+  ViewListLog := TDataViewList.Create;
+  with ViewListLog do begin
     with Columns do begin
       AddItem(STime, 'Time', True, 120);
@@ -238 +318 @@
     ImageIndex := 11;
   end;
-  DataViewLists.Add(NewDataView);
-  FormMain.RegisterDataViewList(NewDataView);
+  FormMain.RegisterDataViewList(ViewListLog);
+  ViewFormLog := TDataViewForm.Create;
+  with ViewFormLog do begin
+    with Items do begin
+      AddItem(STime, 'Time', ctDateTime, True, Bounds(1, 0, 1, 1));
+      AddItem(SUser, 'User', ctReference, True, Bounds(3, 0, 1, 1));
+      AddItem(SText, 'Text', ctEdit, True, Bounds(1, 1, 1, 1));
+    end;
+    Name := 'Log';
+    Caption := SLog;
+    ImageIndex := 11;
+  end;
+  FormMain.RegisterDataViewForm(ViewFormLog);
 end;
 
@@ -247 +338 @@
   Application.Title := SAttendance;
   FormMain.Caption := SAttendance;
-  DataViewLists := TListObject.Create;
-  DataViewForms := TListObject.Create;
   DataModuleAttendance := TDataModuleAttendance.Create(FormMain);
   InitModels;
@@ -257 +346 @@
   I: Integer;
 begin
-  for I := 0 to DataViewLists.Count - 1 do
-    FormMain.UnregisterDataViewList(TDataViewList(DataViewLists[I]));
-  FreeAndNil(DataViewLists);
-  for I := 0 to DataViewForms.Count - 1 do
-    FormMain.UnregisterDataViewForm(TDataViewForm(DataViewForms[I]));
-  FreeAndNil(DataViewForms);
+  FormMain.UnregisterDataViewList(ViewListUser);
+  FormMain.UnregisterDataViewForm(ViewFormUser);
+  FormMain.UnregisterDataViewList(ViewListAttendance);
+  FormMain.UnregisterDataViewForm(ViewFormAttendance);
+  FormMain.UnregisterDataViewList(ViewListHoliday);
+  FormMain.UnregisterDataViewForm(ViewFormHoliday);
+  FormMain.UnregisterDataViewList(ViewListLog);
+  FormMain.UnregisterDataViewForm(ViewFormLog);
+  FormMain.UnregisterDataViewList(ViewListOperation);
+  FormMain.UnregisterDataViewForm(ViewFormOperation);
+  FormMain.UnregisterDataViewList(ViewListPassage);
+  FormMain.UnregisterDataViewForm(ViewFormPassage);
+  FormMain.UnregisterDataViewList(ViewListTerminal);
+  FormMain.UnregisterDataViewForm(ViewFormTerminal);
   FreeAndNil(DataModuleAttendance);
   inherited DoStop;