• R/O
  • SSH
  • HTTPS

zencart-clone: Commit


Commit MetaInfo

Revision17 (tree)
Zeit2016-08-24 21:31:07
Autoryamat0jp

Log Message

ご注文内容発送フォームがしっくりいくようになりました。

Ändern Zusammenfassung

Diff

--- Unit1.pas (revision 16)
+++ Unit1.pas (revision 17)
@@ -482,6 +482,7 @@
482482 begin
483483 UserSession.FThumbnail := Value;
484484 IWGrid1.Visible := Value;
485+ IWFrame8.IWEdit1.Text := '1';
485486 IWFrame8.Visible := not Value;
486487 end;
487488
--- Unit13.pas (nonexistent)
+++ Unit13.pas (revision 17)
@@ -0,0 +1,85 @@
1+unit Unit13;
2+
3+interface
4+
5+uses
6+ Classes, SysUtils, IWAppForm, IWApplication, IWColor, IWTypes, Vcl.Controls,
7+ IWVCLBaseControl, IWBaseControl, IWBaseHTMLControl, IWControl, IWCompButton,
8+ IWCompExtCtrls;
9+
10+type
11+ TIWForm13 = class(TIWAppForm)
12+ IWButton1: TIWButton;
13+ IWRadioGroup1: TIWRadioGroup;
14+ procedure IWButton1Click(Sender: TObject);
15+ procedure IWRadioGroup1Click(Sender: TObject);
16+ procedure IWAppFormCreate(Sender: TObject);
17+ public
18+ end;
19+
20+implementation
21+
22+{$R *.dfm}
23+
24+uses Unit3;
25+
26+procedure TIWForm13.IWAppFormCreate(Sender: TObject);
27+begin
28+ IWRadioGroup1Click(Sender);
29+end;
30+
31+procedure TIWForm13.IWButton1Click(Sender: TObject);
32+var
33+ s: TList;
34+ p: PInteger;
35+ i, j: Integer;
36+begin
37+ s := TList.Create;
38+ try
39+ DM.FDTable2.First;
40+ while (DM.FDTable2.Eof = false) and (i < 100) do
41+ begin
42+ if DM.FDTable2.FieldByName('SERIAL').AsInteger <> i then
43+ begin
44+ New(p);
45+ s.Add(p);
46+ p^ := i;
47+ end;
48+ inc(i);
49+ DM.FDTable2.Next;
50+ end;
51+ DM.FDTable2.Last;
52+ DM.FDQuery1.SQL.Clear;
53+ DM.FDQuery1.SQL.Add('select serial from cart_data where serial = :num');
54+ while (DM.FDTable2.Bof = false) and (s.Count > 0) do
55+ begin
56+ p := s[0];
57+ j := DM.FDTable2.FieldByName('SERIAL').AsInteger;
58+ with DM.FDQuery1 do
59+ begin
60+ ParamByName('num').AsInteger := j;
61+ Open;
62+ First;
63+ while Eof = false do
64+ begin
65+ Fields[0].AsInteger := p^;
66+ Next;
67+ end;
68+ Close;
69+ end;
70+ DM.FDTable2.FieldByName('SERIAL').AsInteger := p^;
71+ DM.FDTable1.Prior;
72+ System.Dispose(p);
73+ s.Delete(0);
74+ end;
75+ finally
76+ s.Free;
77+ end;
78+end;
79+
80+procedure TIWForm13.IWRadioGroup1Click(Sender: TObject);
81+begin
82+ IWButton1.Enabled := IWRadioGroup1.ItemIndex = 1;
83+end;
84+
85+end.
--- Unit3.pas (revision 16)
+++ Unit3.pas (revision 17)
@@ -48,7 +48,6 @@
4848 FDTable5: TFDTable;
4949 item_info: TDataSource;
5050 FDTable5VOLUME: TIntegerField;
51- FDTable5SERIAL: TIntegerField;
5251 FDTable5NAME: TWideStringField;
5352 FDTable5MAKER: TWideStringField;
5453 FDTable5PRICE: TIntegerField;
@@ -91,6 +90,7 @@
9190 FDTableViewMASTER: TIntegerField;
9291 FDTableViewSERIAL: TIntegerField;
9392 view: TDataSource;
93+ FDTable5SERIAL: TIntegerField;
9494 private
9595 { Private 宣言 }
9696 public
--- Unit4.pas (revision 16)
+++ Unit4.pas (revision 17)
@@ -8,7 +8,7 @@
88 IWTemplateProcessorHTML, Vcl.Controls, IWVCLBaseControl, IWBaseControl,
99 IWBaseHTMLControl, IWControl, IWCompGrids, IWCompButton, Variants,
1010 IWCompLabel,
11- IWDBStdCtrls, PngImage, IWCompExtCtrls, Data.DB;
11+ IWDBStdCtrls, IWCompExtCtrls, Data.DB, Jpeg;
1212
1313 type
1414 TCartForm = class(TIWAppForm)
@@ -48,7 +48,7 @@
4848 i, j, k: Integer;
4949 s: TStream;
5050 pic: TIWImage;
51- png: TPngImage;
51+ jpg: TJpegImage;
5252 begin
5353 for i := 0 to IWGrid1.RowCount - 1 do
5454 IWGrid1.Cell[i, 0].Control.Free;
@@ -62,7 +62,7 @@
6262 First;
6363 i := 0;
6464 k := 0;
65- png := TPngImage.Create;
65+ jpg := TJpegImage.Create;
6666 try
6767 while Eof = false do
6868 begin
@@ -70,12 +70,12 @@
7070 begin
7171 s := CreateBlobStream(Fields.Fields[0], bmRead);
7272 try
73- png.LoadFromStream(s);
73+ jpg.LoadFromStream(s);
7474 finally
7575 s.Free;
7676 end;
7777 pic := TIWImage.Create(IWGrid1);
78- pic.Picture.Assign(png);
78+ pic.Picture.Assign(jpg);
7979 IWGrid1.Cell[i, 0].Control := pic;
8080 end;
8181 IWGrid1.Cell[i, 1].Text := Fields.Fields[1].AsString;
@@ -89,7 +89,7 @@
8989 inc(i);
9090 end;
9191 finally
92- png.Free;
92+ jpg.Free;
9393 end;
9494 end;
9595 IWLabel1.Text := Format('(合計) %d + (消費税) %d = %d円',
--- Unit5.pas (revision 16)
+++ Unit5.pas (revision 17)
@@ -11,7 +11,7 @@
1111 FireDAC.Stan.Intf, FireDAC.Stan.Option, FireDAC.Stan.Param,
1212 FireDAC.Stan.Error, FireDAC.DatS, FireDAC.Phys.Intf, FireDAC.DApt.Intf,
1313 FireDAC.Stan.Async, FireDAC.DApt, Data.DB, FireDAC.Comp.DataSet,
14- FireDAC.Comp.Client;
14+ FireDAC.Comp.Client, UITypes;
1515
1616 type
1717 TAdminPage = class(TIWAppForm)
@@ -38,6 +38,12 @@
3838 procedure IWDBNavigator1Last(Sender: TObject);
3939 procedure IWDBNavigator1Next(Sender: TObject);
4040 procedure IWDBNavigator1Prior(Sender: TObject);
41+ procedure IWDBGrid2RenderCell(ACell: TIWGridCell;
42+ const ARow, AColumn: Integer);
43+ procedure IWDBGrid2Render(Sender: TObject);
44+ procedure IWCheckBox1Change(Sender: TObject);
45+ private
46+ dummy: TComponent;
4147 public
4248 end;
4349
@@ -49,14 +55,18 @@
4955
5056 procedure TAdminPage.FDQuery1AfterScroll(DataSet: TDataSet);
5157 begin
52- IWDBGrid1.RowCurrentColor := 200;
58+ if DM.FDTable5.MasterSource = DM.order then
59+ IWDBGrid1.RowCurrentColor := TColorRec.Red
60+ else
61+ IWDBGrid1.RowCurrentColor := TColorRec.White;
5362 end;
5463
5564 procedure TAdminPage.IWAppFormCreate(Sender: TObject);
5665 begin
66+ if DM.FDTable5.MasterSource = nil then
67+ DM.FDTable5.MasterSource := DM.order;
68+ DM.FDTable6.First;
5769 FDQuery1.Open;
58- IWDBLabel1.DataField := 'ID';
59- IWDBLabel2.DataField := 'ADDRESS';
6070 end;
6171
6272 procedure TAdminPage.IWButton1Click(Sender: TObject);
@@ -108,9 +118,46 @@
108118 FDQuery1AfterScroll(nil);
109119 end;
110120
121+procedure TAdminPage.IWCheckBox1Change(Sender: TObject);
122+begin
123+ with Sender as TIWCheckBox do
124+ begin
125+ Checked := true;
126+ if DM.FDTable5.Locate('KEYFIELD', Tag) = true then
127+ begin
128+ DM.FDTable5.Edit;
129+ DM.FDTable5.FieldByName('CHECKVALUE').AsBoolean := true;
130+ DM.FDTable5.Post;
131+ end;
132+ end;
133+end;
134+
135+procedure TAdminPage.IWDBGrid2Render(Sender: TObject);
136+begin
137+ dummy.Free;
138+ dummy := TComponent.Create(IWDBGrid2);
139+ DM.FDTable5.First;
140+end;
141+
142+procedure TAdminPage.IWDBGrid2RenderCell(ACell: TIWGridCell;
143+ const ARow, AColumn: Integer);
144+var
145+ s: TIWCheckBox;
146+begin
147+ if (ARow > 0) and (AColumn = 4) then
148+ begin
149+ s := TIWCheckBox.Create(dummy);
150+ s.Tag := DM.FDTable5.FieldByName('KEYFIELD').AsInteger;
151+ s.Checked := DM.FDTable5.FieldByName('CHECKVALUE').AsBoolean;
152+ s.OnChange := IWCheckBox1Change;
153+ s.Caption := s.Tag.ToString;
154+ ACell.Control := s;
155+ end;
156+end;
157+
111158 procedure TAdminPage.IWDBNavigator1First(Sender: TObject);
112159 begin
113- Dm.FDTable6.First;
160+ DM.FDTable6.First;
114161 end;
115162
116163 procedure TAdminPage.IWDBNavigator1Last(Sender: TObject);
--- Unit7.pas (revision 16)
+++ Unit7.pas (revision 17)
@@ -36,7 +36,7 @@
3636
3737 procedure TPayForm.IWButton1Click(Sender: TObject);
3838 var
39- i, j, k, m: integer;
39+ i, j, k, m, n: integer;
4040 s: string;
4141 v: Variant;
4242 temp: TFDQuery;
@@ -90,6 +90,10 @@
9090 DM.FDTable6.Last;
9191 m := DM.FDTable6.FieldByName('ORDER').AsInteger + 1;
9292 j := 0;
93+ DM.FDTable5.MasterSource := nil;
94+ DM.FDTable5.Last;
95+ k := DM.FDTable5.FieldByName('KEYFIELD').AsInteger;
96+ DM.FDTable5.MasterSource := DM.order;
9397 DM.FDQuery1.Open('select * from cart_data');
9498 DM.FDQuery1.First;
9599 temp := TFDQuery.Create(Self);
@@ -99,15 +103,12 @@
99103 while DM.FDQuery1.Eof = false do
100104 begin
101105 if DM.FDTable2.Locate('SERIAL', DM.FDQuery1.FieldByName('SERIAL')
102- .AsInteger, []) = true then
106+ .AsInteger) = true then
103107 begin
104- DM.FDTable5.Last;
105- k := DM.FDTable5.FieldByName('KEYFIELD').AsInteger + 1;
108+ inc(k);
106109 DM.FDTable5.Append;
107110 DM.FDTable5.FieldByName('VOLUME').AsInteger :=
108111 DM.FDQuery1.FieldByName('VOLUME').AsInteger;
109- DM.FDTable5.FieldByName('SERIAL').AsString :=
110- DM.FDTable2.FieldByName('SERIAL').AsString;
111112 DM.FDTable5.FieldByName('NAME').AsString :=
112113 DM.FDTable2.FieldByName('NAME').AsString;
113114 DM.FDTable5.FieldByName('MAKER').AsString :=
@@ -116,9 +117,11 @@
116117 DM.FDTable2.FieldByName('PRICE').AsInteger;
117118 DM.FDTable5.FieldByName('KEYFIELD').AsInteger := k;
118119 DM.FDTable5.FieldByName('ORDER').AsInteger := m;
120+ DM.FDTable5.FieldByName('CHECKVALUE').AsBoolean := false;
121+ n := DM.FDTable2.FieldByName('SERIAL').AsInteger;
122+ DM.FDTable5.FieldByName('SERIAL').AsInteger := n;
119123 DM.FDTable5.Post;
120- temp.AppendRecord([i, DM.FDTable2.FieldByName('SERIAL')
121- .AsInteger, Date]);
124+ temp.AppendRecord([i, n, Date]);
122125 j := j + DM.FDTable2.FieldByName('PRICE').AsInteger *
123126 DM.FDQuery1.FieldByName('VOLUME').AsInteger;
124127 end;
--- zencart_clone.dpr (revision 16)
+++ zencart_clone.dpr (revision 17)
@@ -19,7 +19,8 @@
1919 Unit8 in 'Unit8.pas' {IWFrame8: TFrame},
2020 Unit9 in 'Unit9.pas' {MyPage: TIWAppForm},
2121 Unit10 in 'Unit10.pas' {IWForm10: TIWAppForm},
22- Unit11 in 'Unit11.pas' {AdminFile: TIWAppForm};
22+ Unit11 in 'Unit11.pas' {AdminFile: TIWAppForm},
23+ Unit13 in 'Unit13.pas' {IWForm13: TIWAppForm};
2324
2425 {$R *.res}
2526
--- zencart_clone.dproj (revision 16)
+++ zencart_clone.dproj (revision 17)
@@ -142,6 +142,11 @@
142142 <FormType>dfm</FormType>
143143 <DesignClass>TIWAppForm</DesignClass>
144144 </DCCReference>
145+ <DCCReference Include="Unit13.pas">
146+ <Form>IWForm13</Form>
147+ <FormType>dfm</FormType>
148+ <DesignClass>TIWAppForm</DesignClass>
149+ </DCCReference>
145150 <None Include="Win32\Release\templates\cart.htm"/>
146151 <None Include="Win32\Release\templates\iteminfo.htm"/>
147152 <None Include="Win32\Release\templates\mypage.htm"/>
Show on old repository browser