Changeset 66 for trunk/Application

Timestamp:

Dec 20, 2011, 9:37:35 AM (13 years ago)

Author:

chronos

Message:

• Opraveno: Generování výstupu u TQueryForm a THtmlTable.
• Přidáno: Mimo přihlašovací formulář přidán také registrační.

Location:

trunk/Application

Files:

• UApplicationInfo.pas (modified) (1 diff)
• UWebObjects.pas (modified) (4 diffs)

trunk/Application/UApplicationInfo.pas

@@ -53 +53 @@
   Name := 'ZděchovNET';
   Identification := 1;
-  ReleaseDate := EncodeDate(2011, 12, 18);
+  ReleaseDate := EncodeDate(2011, 12, 20);
   MajorVersion := 1;
   MinorVersion := 0;

trunk/Application/UWebObjects.pas

@@ -38 +38 @@
     Title: string;
     Rows: TListObject; // TListObject<TQueryFormItem>
+    function AddNewItem: TQueryFormItem;
     constructor Create;
     destructor Destroy; override;
   end;
 
+  TQueryAction = class
+    Name: string;
+  end;
+
   TQueryForm = class(THtmlForm)
-  private
+  protected
+    function GetAsXmlElement: TXmlElement; override;
   public
     Title: string;
     Groups: TListObject; // TListObject<TQueryFormGroup>
-    Actions: TListObject; // TListObject<THtmlInput>
-    function GetAsXmlElement: TXmlElement; override;
+    Actions: TListObject; // TListObject<TQueryAction>
+    ClassId: string;
+    function AddNewGroup: TQueryFormGroup;
+    function AddNewAction: TQueryAction;
     constructor Create;
     destructor Destroy; override;
@@ -90 +98 @@
   I: Integer;
   G: Integer;
+  Table: THtmlTable;
+  Row: THtmlRow;
 begin
   Result := inherited GetAsXmlElement;
   with TXmlTag(Result).SubElements do begin
+    Table := THtmlTable.Create;
+    Table.ClassId := ClassId;
+    Row := THtmlRow(Table.Rows.AddNew(THtmlRow.Create));
+    with THtmlCell(Row.Cells.AddNew(THtmlCell.Create)) do begin
+      ColSpan := 2;
+      Value := THtmlString.Create;
+      THtmlString(Value).Text := Title;
+    end;
+    with Table do
     for G := 0 to Groups.Count - 1 do
     with TQueryFormGroup(Groups[G]) do begin
-      with TXmlString(AddNew(TXmlString.Create)) do begin
-        Text := Title;
-      end;
-      with THtmlLineBreak.Create do begin
-        Add(AsXmlElement);
+      if Title <> '' then begin
+        Row := THtmlRow(Table.Rows.AddNew(THtmlRow.Create));
+        with THtmlCell(Row.Cells.AddNew(THtmlCell.Create)) do begin
+          ColSpan := 2;
+          Value := THtmlString.Create;
+          THtmlString(Value).Text := Title;
+        end;
       end;
       for I := 0 to Rows.Count - 1 do
       with TQueryFormItem(Rows[I]) do begin
-        with TXmlString(AddNew(TXmlString.Create)) do begin
-          Text := Caption + ': ';
+        Row := THtmlRow(Table.Rows.AddNew(THtmlRow.Create));
+        with THtmlCell(Row.Cells.AddNew(THtmlCell.Create)) do begin
+          Value := THtmlString.Create;
+          THtmlString(Value).Text := Caption + ': ';
         end;
-        Add(Value.AsXmlElement);
-        with THtmlLineBreak.Create do begin
-          Add(AsXmlElement);
+        with THtmlCell(Row.Cells.AddNew(THtmlCell.Create)) do begin
+          Value := THtmlInput.Create;
+          Value.Assign(TQueryFormItem(Rows[I]).Value);
         end;
       end;
     end;
-    with THtmlInput.Create do begin
-      Value := 'Přihlásit';
-      InputType := itSubmit;
-      Add(AsXmlElement);
+    Row := THtmlRow(Table.Rows.AddNew(THtmlRow.Create));
+    with THtmlCell(Row.Cells.AddNew(THtmlCell.Create)) do begin
+      ColSpan := 2;
+      for I := 0 to Actions.Count - 1 do
+      Value := THtmlBlock.Create;
+      with THtmlInput(THtmlBlock(Value).SubItems.AddNew(THtmlInput.Create)) do begin
+        Value := TQueryAction(Actions[I]).Name;
+        InputType := itSubmit;
+      end;
     end;
+    Add(Table.AsXmlElement);
+    Table.Free;
   end;
+end;
+
+function TQueryForm.AddNewGroup: TQueryFormGroup;
+begin
+  Result := TQueryFormGroup(Groups.AddNew(TQueryFormGroup.Create));
+end;
+
+function TQueryForm.AddNewAction: TQueryAction;
+begin
+  Result := TQueryAction(Actions.AddNew(TQueryAction.Create));
 end;
 
@@ -125 +165 @@
   Actions := TListObject.Create;
   Groups := TListObject.Create;
+  Method := 'post';
 end;
 
@@ -135 +176 @@
 
 { TQueryFormGroup }
+
+function TQueryFormGroup.AddNewItem: TQueryFormItem;
+begin
+  Result := TQueryFormItem(Rows.AddNew(TQueryFormItem.Create));
+end;
 
 constructor TQueryFormGroup.Create;