Changeset 107

Timestamp:

Oct 10, 2012, 2:50:48 PM (12 years ago)

Author:

chronos

Message:

• Přidáno: Zobrazení aktualit na stránce portálu.

Location:

trunk

Files:

• Application/UWebSession.pas (modified) (2 diffs)
• Modules/Base/UModuleBase.pas (modified) (1 diff)
• Modules/News/UModuleNews.pas (modified) (5 diffs)
• Modules/News/UNews.pas (added)
• Modules/Portal/UModulePortal.pas (modified) (3 diffs)
• Modules/Portal/UPagePortal.pas (modified) (1 diff)
• Modules/User/UModuleUser.pas (modified) (1 diff)
• ZdechovNET.lpi (modified) (2 diffs)

trunk/Application/UWebSession.pas

@@ -149 +149 @@
 
 procedure TWebSession.RegisterModules;
+var
+  ModuleBase: TModuleBase;
 begin
   with ModuleManager do begin
@@ -161 +163 @@
     RegisterModule(TModuleIS.Create(nil), True);
     RegisterModule(TModuleNews.Create(nil), True);
+
+    ModuleBase := TModuleBase(ModuleManager.FindModuleByName('Base'));
+    if Assigned(ModuleBase) then ModuleBase.Session := Self;
   end;
 end;

trunk/Modules/Base/UModuleBase.pas

@@ -19 +19 @@
     FGeneratePage: TGeneratePageEvent;
   public
+    Session: TWebSession;
     Pages: TPageList;
     HandlerData: THTTPHandlerData;

trunk/Modules/News/UModuleNews.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, UModularSystem, SpecializedDictionary, UModuleBase;
+  Classes, SysUtils, UModularSystem, SpecializedDictionary, UModuleBase, UNews,
+  UHTTPServer, UModuleUser;
 
 type
@@ -14 +15 @@
   public
     ModuleBase: TModuleBase;
-    procedure Show;
+    News: TNews;
+    function Show(HandlerData: THTTPHandlerData): string;
     constructor Create(Owner: TComponent); override;
     destructor Destroy; override;
@@ -32 +34 @@
 { TModuleNews }
 
-procedure TModuleNews.Show;
+function TModuleNews.Show(HandlerData: THTTPHandlerData): string;
 begin
-
+  Result := News.Show(HandlerData);
 end;
 
@@ -57 +59 @@
   BeforeStart;
   ModuleBase := TModuleBase(Manager.FindModuleByName('Base'));
-  UserControlPage := TUserControlPage.Create(nil);
-  ModuleBase.Pages.RegisterPage(UserControlPage, 'uzivatel');
+  //UserControlPage := TUserControlPage.Create(nil);
+  //ModuleBase.Pages.RegisterPage(UserControlPage, 'uzivatel');
   //RegisterPage(TUserControlPage, UserControlPage, '');
+  News := TNews.Create;
+  News.ModuleUser := TModuleUser(Manager.FindModuleByName('User'));
+  News.Database := ModuleBase.Session.Database;
+  News.ModuleBase := ModuleBase;
   AfterStart;
 end;
@@ -66 +72 @@
 begin
   BeforeStop;
-  ModuleBase.Pages.UnregisterPage(UserControlPage);
-  FreeAndNil(UserControlPage);
+  FreeAndNil(News);
+  //ModuleBase.Pages.UnregisterPage(UserControlPage);
+  //FreeAndNil(UserControlPage);
   ModuleBase := nil;
   AfterStop;

trunk/Modules/Portal/UModulePortal.pas

@@ -8 +8 @@
   Classes, SysUtils, UModularSystem, SpecializedDictionary, USqlDatabase,
   UUtils, UWebSession, SpecializedList, UUser, UWebPage, UHtmlClasses,
-  UModuleBase, UModuleUser;
+  UModuleBase, UModuleUser, UModuleNews;
 
 type
@@ -66 +66 @@
   WebPagePortal := TWebPagePortal.Create(nil);
   ModuleBase.Pages.RegisterPage(WebPagePortal, '');
-  TWebPagePortal(WebPagePortal).ModuleUser := TModuleUser(Manager.FindModuleByName('User'));
+  ModuleUser := TModuleUser(Manager.FindModuleByName('User'));
+  TWebPagePortal(WebPagePortal).ModuleUser := ModuleUser;
+  TWebPagePortal(WebPagePortal).ModuleNews := TModuleNews(Manager.FindModuleByName('News'));
   AfterStart;
 end;
@@ -76 +78 @@
   FreeAndNil(WebPagePortal);
   ModuleBase := nil;
+  ModuleUser := nil;
   AfterStop;
 end;

trunk/Modules/Portal/UPagePortal.pas

@@ -256 +256 @@
           Output := Output + ShowPanel('Kamery', WebcamPanel)
         else if Panel.Values['Module'] = 'NewsGroupList' then
-          //Output := Output + ShowPanel('Aktuality',
-          //ModuleNews.Show,
+          Output := Output + ShowPanel('Aktuality',
+          ModuleNews.Show(HandlerData)); //,
           //['<a href="?Action=CustomizeNews">Upravit</a>']);
       end;

trunk/Modules/User/UModuleUser.pas

@@ -61 +61 @@
   //RegisterPage(TUserControlPage, UserControlPage, '');
   User := TWebUser.Create;
-  //User.Database := Database;
+  User.Database := ModuleBase.Session.Database;
   UserOnline := TWebOnlineUser.Create;
-  //UserOnline.Database := Database;
+  UserOnline.Database := ModuleBase.Session.Database;
   AfterStart;
 end;

trunk/ZdechovNET.lpi

@@ -117 +117 @@
       </Item7>
     </RequiredPackages>
-    <Units Count="37">
+    <Units Count="38">
       <Unit0>
         <Filename Value="ZdechovNET.lpr"/>
@@ -338 +338 @@
         <UnitName Value="UModuleBase"/>
       </Unit36>
+      <Unit37>
+        <Filename Value="Modules/News/UNews.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="UNews"/>
+      </Unit37>
     </Units>
   </ProjectOptions>