From 34f51a07cbfbad0e17d45ee0f246571f75404f44 Mon Sep 17 00:00:00 2001
From: Nileema <nileema@nileema.(none)>
Date: Wed, 6 Nov 2013 13:25:21 +0530
Subject: [PATCH] -- CRM-13624 Display paper clip icon for file attachments for
 Note and CiviHR profiles

----------------------------------------
* CRM-13624: All Tabs - Paperclip Icon
  http://issues.civicrm.org/jira/browse/CRM-13624
---
 CRM/Contact/Page/View/Note.php           |   4 ++
 CRM/Core/BAO/CustomValueTable.php        |  24 +++++++++--
 CRM/Core/BAO/File.php                    |  49 ++++++++++++++++++++++-
 css/civicrm.css                          |   3 ++
 i/icons/jquery-ui-3E3E3E.gif             | Bin 0 -> 3238 bytes
 templates/CRM/Contact/Page/View/Note.tpl |   6 +++
 6 files changed, 82 insertions(+), 4 deletions(-)
 create mode 100644 i/icons/jquery-ui-3E3E3E.gif

diff --git a/CRM/Contact/Page/View/Note.php b/CRM/Contact/Page/View/Note.php
index e6d54f7df0..9a570257ae 100644
--- a/CRM/Contact/Page/View/Note.php
+++ b/CRM/Contact/Page/View/Note.php
@@ -131,6 +131,10 @@ class CRM_Contact_Page_View_Note extends CRM_Core_Page {
         $contact->fetch();
         $values[$note->id]['createdBy'] = $contact->display_name;
         $values[$note->id]['comment_count'] = CRM_Core_BAO_Note::getChildCount($note->id);
+
+        // paper icon view for attachments part
+        $paperIconAttachmentInfo = CRM_Core_BAO_File::paperIconAttachment('civicrm_note', $note->id);
+        $values[$note->id]['attachment'] = $paperIconAttachmentInfo;
       }
     }
 
diff --git a/CRM/Core/BAO/CustomValueTable.php b/CRM/Core/BAO/CustomValueTable.php
index 74beeed525..011116f98e 100644
--- a/CRM/Core/BAO/CustomValueTable.php
+++ b/CRM/Core/BAO/CustomValueTable.php
@@ -399,7 +399,8 @@ SELECT cg.table_name,
        cg.id as groupID,
        cg.is_multiple,
        cf.column_name,
-       cf.id as fieldID
+       cf.id as fieldID,
+       cf.data_type as fieldDataType
 FROM   civicrm_custom_group cg,
        civicrm_custom_field cf
 WHERE  cf.custom_group_id = cg.id
@@ -419,6 +420,7 @@ AND    $cond
       $fields[$dao->table_name][] = $dao->fieldID;
       $select[$dao->table_name][] = "{$dao->column_name} AS custom_{$dao->fieldID}";
       $isMultiple[$dao->table_name] = $dao->is_multiple ? TRUE : FALSE;
+      $file[$dao->table_name][$dao->fieldID] = $dao->fieldDataType;     
     }
 
     $result = array();
@@ -430,13 +432,29 @@ AND    $cond
           $fieldName = "custom_{$fieldID}";
           if ($isMultiple[$tableName]) {
             if ($formatMultiRecordField) {
-              $result["{$dao->id}"]["{$fieldID}"] = $dao->$fieldName;
+              if($file[$tableName][$fieldID] == 'File') {
+                if($fileid = $dao->$fieldName) {
+                  $fileurl = CRM_Core_BAO_File::paperIconAttachment($tableName,$entityID);
+                  $result["{$dao->id}"]["{$fieldID}"] = $fileurl[$dao->$fieldName];
+                }
+              }
+              else {
+                $result["{$dao->id}"]["{$fieldID}"] = $dao->$fieldName;
+              }
             } else {
               $result["{$fieldID}_{$dao->id}"] = $dao->$fieldName;
             }
           }
           else {
-            $result[$fieldID] = $dao->$fieldName;
+            if($file[$tableName][$fieldID] == 'File') {
+              if($fileid = $dao->$fieldName) {
+                $fileurl = CRM_Core_BAO_File::paperIconAttachment($tableName,$entityID);
+                $result[$fieldID] = $fileurl[$dao->$fieldName];
+              }
+            }
+            else {
+              $result[$fieldID] = $dao->$fieldName;          
+            }
           }
         }
       }
diff --git a/CRM/Core/BAO/File.php b/CRM/Core/BAO/File.php
index f09e64a11d..c74d6488d8 100644
--- a/CRM/Core/BAO/File.php
+++ b/CRM/Core/BAO/File.php
@@ -556,5 +556,52 @@
     CRM_Core_BAO_File::deleteEntityFile($params['entityTable'], $params['entityID'], NULL, $params['fileID']);
   }
 
-}
 
+  /**
+   * function to display paper icon for a file attachment -- CRM-13624
+   *
+   * @static
+   * @access public
+   */
+  static function paperIconAttachment( $entityTable, $entityID ) {
+     if (empty($entityTable) || !$entityID) {
+       $results = NULL;
+       return $results;
+     }
+    $currentAttachmentInfo = self::getEntityFile( $entityTable, $entityID );
+    foreach($currentAttachmentInfo as $fileKey => $fileValue) {
+      $fileID = $fileValue['fileID'];
+      $fileType = $fileValue['mime_type'];
+      $eid = $entityID;
+      if($fileID) {
+        if ($fileType == 'image/jpeg' ||
+            $fileType == 'image/pjpeg' ||
+            $fileType == 'image/gif' ||
+            $fileType == 'image/x-png' ||
+            $fileType == 'image/png'
+            ) {
+          $url = $fileValue['url'];
+          $alt = $fileValue['cleanName'];
+          $file_url[$fileID] = "
+              <a href=\"$url\" class='crm-image-popup'>
+              <div class='icon paper-icon' title=\"$alt\" alt=\"$alt\"></div>
+              </a>";
+          // for non image files
+        }
+        else {
+          $url = $fileValue['url'];
+          $alt = $fileValue['cleanName'];
+          $file_url[$fileID] = "<a href=\"$url\"><div class='icon paper-icon' title=\"$alt\" alt=\"$alt\"></div></a>";
+        }
+      }
+    }
+    if(empty($file_url)) {
+       $results = NULL;
+    }
+    else {
+       $results = $file_url;
+    }
+    return $results;
+  }
+
+}
\ No newline at end of file
diff --git a/css/civicrm.css b/css/civicrm.css
index e20282fb89..78f36da8e4 100644
--- a/css/civicrm.css
+++ b/css/civicrm.css
@@ -4032,3 +4032,6 @@ span.crm-status-icon {
   color: #fff;
 }
 
+.crm-container .paper-icon {
+  background-position: -101px -222px;background-image: url("../i/icons/jquery-ui-3E3E3E.gif");
+}
\ No newline at end of file
diff --git a/i/icons/jquery-ui-3E3E3E.gif b/i/icons/jquery-ui-3E3E3E.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f74568b72115466f531c45d86e1dbee3c26a966b
GIT binary patch
literal 3238
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
Y0T;jo3IG5AV1r3G1vt5r7!w2lJNUs7WdHyG

literal 0
HcmV?d00001

diff --git a/templates/CRM/Contact/Page/View/Note.tpl b/templates/CRM/Contact/Page/View/Note.tpl
index 6dc07d0e38..2a9dbf73d2 100644
--- a/templates/CRM/Contact/Page/View/Note.tpl
+++ b/templates/CRM/Contact/Page/View/Note.tpl
@@ -236,6 +236,7 @@
           <th>{ts}Subject{/ts}</th>
           <th>{ts}Date{/ts}</th>
           <th>{ts}Created By{/ts}</th>
+          <th>{ts}Attachment(s){/ts}</th>
           <th></th>
         </tr>
         </thead>
@@ -267,6 +268,11 @@
             <td class="crm-note-createdBy">
                 <a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=`$note.contact_id`"}">{$note.createdBy}</a>
             </td>
+            <td class="crm-note-attachment">
+                {foreach from=$note.attachment item=fileinfo}
+                  {$fileinfo}
+                {/foreach}
+            </td>
             <td class="nowrap">{$note.action|replace:'xx':$note.id}</td>
         </tr>
         {/foreach}
-- 
2.25.1