Check-in [2280e19a4f]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Added filter panel for activities, and Execute for actProjectAdd.
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 2280e19a4f4c7322a5a74163efc6242943c15cd0
User & Date: MCO 2014-07-04 12:07:44
Context
2014-07-04
13:03
Added description of some ideas to implement the data layer. Probably far too complex for now. check-in: 585524dc59 user: MCO tags: trunk
12:07
Added filter panel for activities, and Execute for actProjectAdd. check-in: 2280e19a4f user: MCO tags: trunk
11:23
Added all-new attempt at centralized time tracking project. check-in: 560965e03c user: MCO tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to Olam/src/F_Activities.dfm. 

844
845
846
847
848
849
850
851
852
853
854
855
























856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912


913
914
915

916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950


    0000000F0000E0000000000F0000F0000000000F0000F8000000003F0000F800
    0000007F0000F000000000FF0000F000000001FF0000F000000003FF0000F000
    000007FF0000F00000001FFF0000F00000003FFF0000F80000007FFF0000FF80
    0000FFFF0000FFFE0001FFFF0000FFFFF803FFFF0000FFFFFFEFFFFF0000FFFF
    FFFFFFFF0000}
  OldCreateOrder = False
  Position = poOwnerFormCenter
  DesignSize = (
    634
    510)
  PixelsPerInch = 96
  TextHeight = 13
























  object lvwActivities: TListView
    Left = 8
    Top = 8
    Width = 497
    Height = 494
    Anchors = [akLeft, akTop, akRight, akBottom]
    Columns = <
      item
        Alignment = taCenter
        Caption = 'Start'
        ImageIndex = 1813
        Width = 75
      end
      item
        Alignment = taRightJustify
        Caption = 'Finish'
        ImageIndex = 1814
        Width = 70
      end
      item
        Caption = 'Project'
        ImageIndex = 125
        Width = 100
      end
      item
        Caption = 'Description'
        ImageIndex = 1659
        Width = 250
      end
      item
        Caption = 'Phase'
        ImageIndex = 100
        Width = 75
      end
      item
        Caption = 'Duration'
        ImageIndex = 1810
        Width = 75
      end>
    Groups = <
      item
        Header = 'maandag'
        GroupID = 0
        State = [lgsNormal]
        HeaderAlign = taLeftJustify
        FooterAlign = taLeftJustify
        TitleImage = -1
      end
      item
        Header = 'dinsdag'
        GroupID = 1
        State = [lgsNormal]
        HeaderAlign = taLeftJustify
        FooterAlign = taLeftJustify
        TitleImage = -1
      end>
    MultiSelect = True


    ReadOnly = True
    RowSelect = True
    SmallImages = dmMain.imlMain

    TabOrder = 0
    ViewStyle = vsReport
    ExplicitHeight = 300
  end
  object btnAdd: TButton
    Left = 511
    Top = 8
    Width = 115
    Height = 33
    Action = dmMain.actActivityAdd
    Anchors = [akTop, akRight]
    Images = dmMain.imlMain
    TabOrder = 1
  end
  object btnEdit: TButton
    Left = 511
    Top = 47
    Width = 115
    Height = 34
    Action = dmMain.actActivityEdit
    Anchors = [akTop, akRight]
    Images = dmMain.imlMain
    TabOrder = 2
  end
  object Button1: TButton
    Left = 511
    Top = 87
    Width = 115
    Height = 34
    Action = dmMain.actActivityDelete
    Anchors = [akTop, akRight]
    Images = dmMain.imlMain
    TabOrder = 3
  end
end









<
<
<


>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
|
|
|
|
|
|
|
|
<
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
|
>
>
|
|
|
>
|
|
<
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
>

844
845
846
847
848
849
850



851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884

885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914

















915
916
917
918
919
920
921
922
923

924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956

    0000000F0000E0000000000F0000F0000000000F0000F8000000003F0000F800
    0000007F0000F000000000FF0000F000000001FF0000F000000003FF0000F000
    000007FF0000F00000001FFF0000F00000003FFF0000F80000007FFF0000FF80
    0000FFFF0000FFFE0001FFFF0000FFFFF803FFFF0000FFFFFFEFFFFF0000FFFF
    FFFFFFFF0000}
  OldCreateOrder = False
  Position = poOwnerFormCenter



  PixelsPerInch = 96
  TextHeight = 13
  object pnlFilter: TPanel
    Left = 0
    Top = 0
    Width = 634
    Height = 41
    Align = alTop
    BevelOuter = bvNone
    TabOrder = 0
    ExplicitLeft = 408
    ExplicitTop = 240
    ExplicitWidth = 185
  end
  object Panel1: TPanel
    Left = 0
    Top = 41
    Width = 634
    Height = 469
    Align = alClient
    BevelOuter = bvNone
    TabOrder = 1
    ExplicitTop = 47
    DesignSize = (
      634
      469)
    object lvwActivities: TListView
      Left = 8
      Top = 0
      Width = 497
      Height = 457
      Anchors = [akLeft, akTop, akRight, akBottom]
      Columns = <
        item

          Caption = 'Start'
          ImageIndex = 1813
          Width = 75
        end
        item
          Alignment = taRightJustify
          Caption = 'Finish'
          ImageIndex = 1814
          Width = 70
        end
        item
          Caption = 'Project'
          ImageIndex = 125
          Width = 100
        end
        item
          Caption = 'Description'
          ImageIndex = 1659
          Width = 250
        end
        item
          Caption = 'Phase'
          ImageIndex = 100
          Width = 75
        end
        item
          Caption = 'Duration'
          ImageIndex = 1810
          Width = 75
        end>

















      MultiSelect = True
      GroupHeaderImages = dmMain.imlMain
      GroupView = True
      ReadOnly = True
      RowSelect = True
      SmallImages = dmMain.imlMain
      StateImages = dmMain.imlMain
      TabOrder = 0
      ViewStyle = vsReport

    end
    object btnAdd: TButton
      Left = 511
      Top = 0
      Width = 115
      Height = 33
      Action = dmMain.actActivityAdd
      Anchors = [akTop, akRight]
      Images = dmMain.imlMain
      TabOrder = 1
    end
    object btnEdit: TButton
      Left = 511
      Top = 39
      Width = 115
      Height = 34
      Action = dmMain.actActivityEdit
      Anchors = [akTop, akRight]
      Images = dmMain.imlMain
      TabOrder = 2
    end
    object Button1: TButton
      Left = 511
      Top = 79
      Width = 115
      Height = 34
      Action = dmMain.actActivityDelete
      Anchors = [akTop, akRight]
      Images = dmMain.imlMain
      TabOrder = 3
    end
  end
end

Changes to Olam/src/F_Activities.pas. 

1
2
3
4
5
6
7
8
9
10
11


12
13
14
15
16
17
18

unit F_Activities;

interface

uses
  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
  Vcl.Controls, Vcl.Forms, Vcl.Dialogs,
  M_Main, Vcl.StdCtrls, Vcl.ComCtrls;

type
  TfrmActivities = class(TForm)


    lvwActivities: TListView;
    btnAdd: TButton;
    btnEdit: TButton;
    Button1: TButton;
  private
    { Private declarations }
  public








|



>
>








1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20

unit F_Activities;

interface

uses
  Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants, System.Classes, Vcl.Graphics,
  Vcl.Controls, Vcl.Forms, Vcl.Dialogs,
  M_Main, Vcl.StdCtrls, Vcl.ComCtrls, Vcl.ExtCtrls;

type
  TfrmActivities = class(TForm)
    pnlFilter: TPanel;
    Panel1: TPanel;
    lvwActivities: TListView;
    btnAdd: TButton;
    btnEdit: TButton;
    Button1: TButton;
  private
    { Private declarations }
  public

Changes to Olam/src/M_Main.dfm. 

3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
.....
68526
68527
68528
68529
68530
68531
68532

68533
68534
68535
68536
68537
68538
68539

  Height = 150
  Width = 215
  object imlMain: TImageList
    ColorDepth = cd32Bit
    Left = 8
    Top = 8
    Bitmap = {
      494C01011A082808140010001000FFFFFFFF2110FFFFFFFFFFFFFFFF424D3600
      0000000000003600000028000000400000007020000001002000000000000070
      2000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
................................................................................
    Images = imlMain
    Left = 8
    Top = 64
    object actProjectAdd: TAction
      Category = 'Project'
      Caption = 'Add project'
      ImageIndex = 126

    end
    object actProjectEdit: TAction
      Category = 'Project'
      Caption = 'Edit project'
      ImageIndex = 128
    end
    object actProjectDelete: TAction








|







 







>








3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
.....
68526
68527
68528
68529
68530
68531
68532
68533
68534
68535
68536
68537
68538
68539
68540

  Height = 150
  Width = 215
  object imlMain: TImageList
    ColorDepth = cd32Bit
    Left = 8
    Top = 8
    Bitmap = {
      494C01011A082808180010001000FFFFFFFF2110FFFFFFFFFFFFFFFF424D3600
      0000000000003600000028000000400000007020000001002000000000000070
      2000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
................................................................................
    Images = imlMain
    Left = 8
    Top = 64
    object actProjectAdd: TAction
      Category = 'Project'
      Caption = 'Add project'
      ImageIndex = 126
      OnExecute = actProjectAddExecute
    end
    object actProjectEdit: TAction
      Category = 'Project'
      Caption = 'Edit project'
      ImageIndex = 128
    end
    object actProjectDelete: TAction

Changes to Olam/src/M_Main.pas. 

13
14
15
16
17
18
19

20
21
22
23
24
25
26
27
28
29


30
31
32
33
34






35

    actProjectAdd: TAction;
    actProjectEdit: TAction;
    actProjectDelete: TAction;
    actActivityAdd: TAction;
    actActivityEdit: TAction;
    actActivityDelete: TAction;
    actProjectAddActivity: TAction;

  private
    { Private declarations }
  public
    { Public declarations }
  end;

var
  dmMain: TdmMain;

implementation



{%CLASSGROUP 'Vcl.Controls.TControl'}

{$R *.dfm}







end.








>










>
>





>
>
>
>
>
>


13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44

    actProjectAdd: TAction;
    actProjectEdit: TAction;
    actProjectDelete: TAction;
    actActivityAdd: TAction;
    actActivityEdit: TAction;
    actActivityDelete: TAction;
    actProjectAddActivity: TAction;
    procedure actProjectAddExecute(Sender: TObject);
  private
    { Private declarations }
  public
    { Public declarations }
  end;

var
  dmMain: TdmMain;

implementation
uses
  F_Projects;

{%CLASSGROUP 'Vcl.Controls.TControl'}

{$R *.dfm}

{ ---------------------------------------------------------------------------- }
procedure TdmMain.actProjectAddExecute(Sender: TObject);
begin
  // TODO
end {TdmMain.actProjectAddExecute};

end.

Changes to Olam/src/Olam.dpr. 

7
8
9
10
11
12
13
14
15
16
17
18

  F_Activities {frmActivities};

{$R *.res}

begin
  Application.Initialize;
  Application.MainFormOnTaskbar := True;
  Application.CreateForm(TfrmActivities, frmActivities);
  Application.CreateForm(TfrmProjects, frmProjects);
  Application.CreateForm(TdmMain, dmMain);
  Application.Run;
end.








|
|




7
8
9
10
11
12
13
14
15
16
17
18

  F_Activities {frmActivities};

{$R *.res}

begin
  Application.Initialize;
  Application.MainFormOnTaskbar := True;
  Application.CreateForm(TfrmProjects, frmProjects);
  Application.CreateForm(TfrmActivities, frmActivities);
  Application.CreateForm(TdmMain, dmMain);
  Application.Run;
end.

Fossil version [6a0ec82bae] 2019-10-12 22:39:37