Changeset 678

Timestamp:

Jul 26, 2014, 11:15:46 AM (10 years ago)

Author:

chronos

Message:

• Přidáno: Oblíbené položky v nabídce.
• Přidáno: Popis a povolení příjmu zpráv u kontaktů.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Common/Setup/Updates.php (modified) (2 diffs)
• Modules/IS/IS.php (modified) (9 diffs)
• Modules/Subject/Subject.php (modified) (1 diff)
• images/Favorite-Add.png (added)
• images/Favorite-Del.png (added)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 677; // Subversion revision
-$DatabaseRevision = 676; // SQL structure revision
+$Revision = 678; // Subversion revision
+$DatabaseRevision = 678; // SQL structure revision
 $ReleaseTime = strtotime('2014-07-25');

trunk/Common/Setup/Updates.php

@@ -848 +848 @@
 }
 
+function UpdateTo678($Manager)
+{
+  $Manager->Execute('ALTER TABLE `Contact` ADD `Description` VARCHAR( 255 ) NOT NULL ;');
+  $Manager->Execute('ALTER TABLE `Contact` ADD `Receive` BOOLEAN NOT NULL ;');
+
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `MenuItemFavorite` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `User` int(11) NOT NULL,
+  `MenuItem` int(11) NOT NULL,
+  PRIMARY KEY (`Id`),
+  KEY `User` (`User`),
+  KEY `MenuItem` (`MenuItem`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
+
+  $Manager->Execute('ALTER TABLE `MenuItemFavorite`
+  ADD CONSTRAINT `MenuItemFavorite_ibfk_2` FOREIGN KEY (`MenuItem`) REFERENCES `MenuItem` (`Id`),
+  ADD CONSTRAINT `MenuItemFavorite_ibfk_1` FOREIGN KEY (`User`) REFERENCES `User` (`Id`);');
+
+  $Manager->Execute('INSERT INTO `Action` (`Id` ,`Name` ,`Title` ,`Type` ,`URL` ,
+`Group` ,`Icon` ,`PermissionOperation` ,`Enable`) VALUES (
+NULL , "", "Oblíbené položky nabídky", "1", "/is/?t=MenuItemFavorite&a=list", NULL , NULL , NULL , "1");');
+  $ActionId = $Manager->Database->insert_id;
+  $DbResult = $Manager->Execute('SELECT `Id` FROM `MenuItem` WHERE `Name`="Nabídky"');
+  if($DbResult->num_rows > 0)
+  {
+        $DbRow = $DbResult->fetch_assoc();
+    $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
+      "VALUES (NULL , 'Oblíbené položky nabídky', ".$DbRow['Id'].", '".$ActionId."', '1');");
+  }
+}
+
 class Updates
 {
@@ -894 +925 @@
       671 => array('Revision' => 674, 'Function' => 'UpdateTo674'),
       674 => array('Revision' => 676, 'Function' => 'UpdateTo676'),
+      676 => array('Revision' => 678, 'Function' => 'UpdateTo678'),
     ));
   }

trunk/Modules/IS/IS.php

@@ -23 +23 @@
     if(array_key_exists('i', $_GET)) $ItemId = $_GET['i'];
       else $ItemId = 0;
+    if(array_key_exists('menutype', $_COOKIE)) $MenuType = $_COOKIE['menutype'];
+      else $MenuType = 0;
+    if(array_key_exists('menutype', $_GET)) $MenuType = $_GET['menutype'] * 1;
+    setcookie('menutype', $MenuType, time() + 60 * 60 * 24 * 365);
 
     if($Action == 'list') $Content = $this->ShowList($Table);
@@ -32 +36 @@
     else if($Action == 'view') $Content = $this->ShowView($Table, $ItemId);
     else if($Action == 'delete') $Content = $this->ShowDelete($Table, $ItemId);
+    else if($Action == 'fav_add') $Content = $this->ShowFavoriteAdd($Table, $ItemId);
+    else if($Action == 'fav_del') $Content = $this->ShowFavoriteDel($Table, $ItemId);
     else $Content = $this->Dashboard();
     if($this->HideMenu == false)
     {
       $Output = '<table style="width: 100%"><tr><td style="width: 20%; vertical-align: top;">';
-      $Output .= '<strong>Nabídka:</strong>'.$this->ShowMenu();
+      $MenuTypeText = '<a href="?menutype=0">Nabídka</a>';
+      if($MenuType == 0) $MenuTypeText = '<strong>'.$MenuTypeText.'</strong>';
+      $Output .= $MenuTypeText.' ';
+      $MenuTypeText = '<a href="?menutype=1">Oblíbené</a>';
+      if($MenuType == 1) $MenuTypeText = '<strong>'.$MenuTypeText.'</strong>';
+      $Output .= $MenuTypeText.' ';
+      if($MenuType == 0) $Output .= $this->ShowMenu();
+      if($MenuType == 1) $Output .= $this->ShowFavorites();
       $Output .= '</td><td style="width: 80%; vertical-align: top;">';
       $Output .= $Content;
@@ -69 +82 @@
     $DbRow = $DbResult->fetch_row();
     $Output .= 'Nezpárovaných plateb: '.$DbRow['0'].'<br/>';
+    return($Output);
+  }
+
+  function ShowFavoriteAdd($Table, $ItemId)
+  {
+    $DbResult = $this->Database->select('MenuItemFavorite', 'Id', '(`MenuItem`='.($_GET['i'] * 1).') AND (`User`='.$this->System->User->User['Id'].')');
+    if($DbResult->num_rows > 0)
+    {
+      $Output = $this->SystemMessage('Oblíbené', 'Již existuje v oblíbených');
+    } else {
+      $this->Database->insert('MenuItemFavorite', array('MenuItem' => ($_GET['i'] * 1), 'User' => $this->System->User->User['Id']));
+      $Output = $this->SystemMessage('Oblíbené', 'Přidáno do oblíbených');
+    }
+    $Output .= $this->ShowList($Table);
+    return($Output);
+  }
+
+  function ShowFavoriteDel($Table, $ItemId)
+  {
+    $DbResult = $this->Database->select('MenuItemFavorite', 'Id', '(`MenuItem`='.($_GET['i'] * 1).') AND (`User`='.$this->System->User->User['Id'].')');
+    if($DbResult->num_rows > 0)
+    {
+      $DbRow = $DbResult->fetch_assoc();
+      $this->Database->delete('MenuItemFavorite', '`Id`= '.$DbRow['Id']);
+      $Output = $this->SystemMessage('Oblíbené', 'Odstraněno z oblíbených');
+    } else {
+      $Output = $this->SystemMessage('Oblíbené', 'Nenalezeno v oblíbených');
+    }
+    $Output .= $this->ShowList($Table);
     return($Output);
   }
@@ -535 +577 @@
     $Output .= '<li><a href="?a=list&amp;t='.$Table.'"><img alt="Seznam" title="Seznam" src="'.
       $this->System->Link('/images/list.png').'"/>Seznam</a></li>';
+    $MI = 0;
+    if(array_key_exists('mi', $_GET))
+    {
+      $DbResult = $this->Database->select('MenuItemFavorite', 'Id', '(`MenuItem`='.($_GET['mi'] * 1).') AND (`User`='.$this->System->User->User['Id'].')');
+      if($DbResult->num_rows > 0)
+      {
+        $DbRow = $DbResult->fetch_assoc();
+        $Fav = $DbRow['Id'];
+        $Output .= '<li><a href="?a=fav_del&amp;t='.$Table.'&amp;i='.$_GET['mi'].'&amp;mi='.$_GET['mi'].'"><img alt="Odebrat z oblíbených" title="Odebrat z oblíbených" src="'.
+          $this->System->Link('/images/Favorite-Del.png').'"/>Odebrat z oblíbených</a></li>';
+      } else $Output .= '<li><a href="?a=fav_add&amp;t='.$Table.'&amp;i='.$_GET['mi'].'&amp;mi='.$_GET['mi'].'"><img alt="Přidat do oblíbených" title="Přidat do oblíbených" src="'.
+          $this->System->Link('/images/Favorite-Add.png').'"/>Přidat do oblíbených</a></li>';
+    }
     if(array_key_exists('Actions', $FormClass))
     {
@@ -543 +598 @@
     $Output .= '</ul>';
     return($Output);
+  }
+
+  function ShowFavorites()
+  {
+    $this->MenuItems = array();
+    $DbResult = $this->Database->query('SELECT `MenuItem`.`Id`, `MenuItem`.`Name`, `MenuItem`.`Parent`, `Action`.`URL` AS `URL`, `ActionIcon`.`Name` AS `IconName`, `Action`.`PermissionOperation` AS `Permission` FROM `MenuItemFavorite` ' .
+      'LEFT JOIN `MenuItem` ON `MenuItem`.`Id` = `MenuItemFavorite`.`MenuItem` '.
+      'LEFT JOIN `Action` ON `Action`.`Id` = `MenuItem`.`Action` '.
+      'LEFT JOIN `ActionIcon` ON `ActionIcon`.`Id` = `Action`.`Icon` '.
+      'WHERE `MenuItemFavorite`.`User`='.$this->System->User->User['Id'].' '.
+      'ORDER BY `MenuItem`.`Parent`,`MenuItem`.`Name`');
+    while($DbRow = $DbResult->fetch_assoc())
+    {
+      //if($DbRow['Permission'] != '')
+      $this->MenuItems[$DbRow['Id']] = $DbRow;
+    }
+    return($this->ShowMenuItem('', true));
   }
 
@@ -561 +633 @@
   }
 
-  function ShowMenuItem($Parent)
+  function ShowMenuItem($Parent, $All = false)
   {
     $Output = '<ul style="list-style: none; margin-left:1em; padding-left:0em;">';
     foreach($this->MenuItems as $MenuItem)
-    if($MenuItem['Parent'] == $Parent)
+    if(($MenuItem['Parent'] == $Parent) or $All)
     {
       $LinkTitle = $MenuItem['Name'];
@@ -572 +644 @@
         $Icon = 'Device.png';
         if(substr($MenuItem['URL'], 0, 4) != 'http') $MenuItem['URL'] = $this->System->Link($MenuItem['URL']);
-        $LinkTitle = MakeLink($MenuItem['URL'], $LinkTitle);
+        $LinkTitle = MakeLink($MenuItem['URL'].'&amp;mi='.$MenuItem['Id'], $LinkTitle);
       } else $Icon = 'Folder.png';
       if($MenuItem['IconName'] != '') $Image = '<img src="'.$this->System->Link('/images/favicons/'.$MenuItem['IconName']).'"/>&nbsp;';
@@ -578 +650 @@
       //if($this->System->User->CheckPermission($this->TableToModule($Table), 'Write') or !defined('NEW_PERMISSION'))
         $Output .= '<li>'.$Image.$LinkTitle.'</li>';
-      $Output .= $this->ShowMenuItem($MenuItem['Id']);
+      if($All == false) $Output .= $this->ShowMenuItem($MenuItem['Id']);
     }
     $Output .= '</ul>';
@@ -631 +703 @@
       ),
     ));
+    $this->System->FormManager->RegisterClass('MenuItemFavorite', array(
+      'Title' => 'Oblíbené položky nabídky',
+      'Table' => 'MenuItemFavorite',
+      'Items' => array(
+        'User' => array('Type' => 'TUser', 'Caption' => 'Uživatele', 'Default' => '0'),
+        'MenuItem' => array('Type' => 'TMenuItem', 'Caption' => 'Položka nabídky', 'Default' => '0'),
+      ),
+    ));
     $this->System->FormManager->RegisterClass('Menu', array(
       'Title' => 'Nabídky',

trunk/Modules/Subject/Subject.php

@@ -88 +88 @@
         'User' => array('Type' => 'TUser', 'Caption' => 'Uživatel', 'Default' => '', 'Null' => true),
         'Subject' => array('Type' => 'TSubject', 'Caption' => 'Subject', 'Default' => '', 'Null' => true),
+        'Description' => array('Type' => 'String', 'Caption' => 'Popis', 'Default' => ''),
+        'Receive' => array('Type' => 'Boolean', 'Caption' => 'Přijímat zprávy', 'Default' => '0'),
       ),
     ));