Merge pull request #1337 from TechnologyEnhancedLearning/Develop/fix/TD-5836/ArticileFilesize

TD-5836-Article attachment filesize incorrect -ResourseDeatilsPage

Author: AnjuJose011

LearningHub.Nhs.WebUI/Controllers/ContributeController.cs

@@ -202,8 +202,9 @@ public async Task<FileUploadResult> UploadArticleFile(IFormCollection inputForm)
             var file = inputForm.Files[0];
             int.TryParse(inputForm["resourceVersionId"], out int resourceVersionId);
             int.TryParse(inputForm["changeingFileId"], out int existingFileId);
+            int.TryParse(inputForm["fileSize"], out int fileSize);
             var currentUserId = this.User.Identity.GetCurrentUserId();
-            return await this.contributeService.ProcessArticleFileAsync(resourceVersionId, file, existingFileId, currentUserId);
+            return await this.contributeService.ProcessArticleFileAsync(resourceVersionId, file, fileSize, existingFileId, currentUserId);
         }
 
         /// <summary>

LearningHub.Nhs.WebUI/Interfaces/IContributeService.cs

@@ -87,10 +87,11 @@ public interface IContributeService
         /// </summary>
         /// <param name="resourceVersionId">Resource version id.</param>
         /// <param name="file">File.</param>
+        /// <param name="fileSize">fileSize.</param>
         /// <param name="changeingFileId">Changing file id.</param>
         /// <param name="currentUserId">Current user id.</param>
         /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.</returns>
-        Task<FileUploadResult> ProcessArticleFileAsync(int resourceVersionId, IFormFile file, int changeingFileId, int currentUserId);
+        Task<FileUploadResult> ProcessArticleFileAsync(int resourceVersionId, IFormFile file, int fileSize,int changeingFileId, int currentUserId);
 
         /// <summary>
         /// The ProcessResourceAttachedFileAsync.

LearningHub.Nhs.WebUI/Scripts/vuesrc/contribute/ContentCommon.vue

@@ -243,7 +243,7 @@
             </div>
         </div>
 
-        <catalogue-select v-if="resourceCatalogueCount>1 && showCatalogueSelect" v-model.number="resourceCatalogueId" @input="catalogueSelected"></catalogue-select>
+        <catalogue-select v-if="resourceCatalogueCount>0 && showCatalogueSelect" v-model.number="resourceCatalogueId" @input="catalogueSelected"></catalogue-select>
     </div>
 </template>
 

LearningHub.Nhs.WebUI/Services/ContributeService.cs

@@ -382,10 +382,11 @@ public async Task<FileChunkDetailViewModel> GetFileChunkDetail(int fileChunkDeta
         /// </summary>
         /// <param name="resourceVersionId">The resourceVersionId<see cref="int"/>.</param>
         /// <param name="file">The file<see cref="IFormFile"/>.</param>
+        /// <param name="fileSize">The fileSize<see cref="int"/>.</param>
         /// <param name="existingFileId">The existingFileId<see cref="int"/>.</param>
         /// <param name="currentUserId">The currentUserId<see cref="int"/>.</param>
         /// <returns>The <see cref="Task{FileUploadResult}"/>.</returns>
-        public async Task<FileUploadResult> ProcessArticleFileAsync(int resourceVersionId, IFormFile file, int existingFileId, int currentUserId)
+        public async Task<FileUploadResult> ProcessArticleFileAsync(int resourceVersionId, IFormFile file, int fileSize, int existingFileId, int currentUserId)
         {
             var filelocation = string.Empty;
             string extension = Path.GetExtension(file.FileName).Replace(".", string.Empty);
@@ -415,7 +416,7 @@ public async Task<FileUploadResult> ProcessArticleFileAsync(int resourceVersionI
                 FileTypeId = fileType == null ? 0 : fileType.Id,
                 FileName = file.FileName,
                 FilePath = filelocation,
-                FileSize = (int)(file.Length / 1000),
+                FileSize = (int)(fileSize / 1000),
                 ReplacedFileId = existingFileId,
             });
 
@@ -425,7 +426,7 @@ public async Task<FileUploadResult> ProcessArticleFileAsync(int resourceVersionI
                 ResourceVersionId = resourceVersionId,
                 FileName = file.FileName,
                 FileTypeId = fileType == null ? 0 : fileType.Id,
-                FileSizeKb = (int)(file.Length / 1000),
+                FileSizeKb = (int)(fileSize / 1000),
                 Invalid = false,
             };
         }