Merge branch 'redesign' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into redesign

# Conflicts:
#	frontend/src/app/_elements/column-table/column-table.component.css
#	frontend/src/app/_elements/column-table/column-table.component.ts

1 files changed, 20 insertions, 0 deletions

diff --git a/backend/api/api/Controllers/FileController.cs b/backend/api/api/Controllers/FileController.cs
index 68d2ebed..0e9f9b97 100644
--- a/backend/api/api/Controllers/FileController.cs
+++ b/backend/api/api/Controllers/FileController.cs
@@ -115,6 +115,26 @@ namespace api.Controllers
                 return String.Join("\n", System.IO.File.ReadLines(filePath).Take(10));
         }
 
+        [HttpGet("csvread/{hasHeader}/{fileId}/{skipRows}/{takeRows}")]
+        [Authorize(Roles = "User,Guest")]
+        public ActionResult<string> CsvRead(bool hasHeader, string fileId, int skipRows, int takeRows)
+        {
+
+            string uploaderId = getUserId();
+
+            if (uploaderId == null)
+                return BadRequest();
+
+            //String csvContent = System.IO.File.ReadAllText(fileModel.path);
+            string filePath = _fileservice.GetFilePath(fileId, uploaderId);
+
+
+
+            if (hasHeader)
+                return String.Join("\n", System.IO.File.ReadLines(filePath).Skip(skipRows+1).Take(takeRows));
+            else
+                return String.Join("\n", System.IO.File.ReadLines(filePath).Skip(skipRows).Take(takeRows));
+        }
 
 
         [HttpPost("Csv")]