From 66ad4a516bf57c8c5c385ed5236c03dc2decfacb Mon Sep 17 00:00:00 2001
From: tomschindler <tom.schindler@student.uni-halle.de>
Date: Wed, 19 Jun 2024 12:43:53 +0200
Subject: [PATCH] einlesen korrigiert
---
{csv => public/csv}/smartphone_dataset.csv | 0
public/main.js | 21 ++++++++++++++-------
src/Main.elm | 11 +++++++----
3 files changed, 21 insertions(+), 11 deletions(-)
rename {csv => public/csv}/smartphone_dataset.csv (100%)
diff --git a/csv/smartphone_dataset.csv b/public/csv/smartphone_dataset.csv
similarity index 100%
rename from csv/smartphone_dataset.csv
rename to public/csv/smartphone_dataset.csv
diff --git a/public/main.js b/public/main.js
index bfa1118..9c1b370 100644
--- a/public/main.js
+++ b/public/main.js
@@ -5334,9 +5334,9 @@ var $elm$core$Task$perform = F2(
A2($elm$core$Task$map, toMessage, task)));
});
var $elm$browser$Browser$element = _Browser_element;
-var $author$project$Main$Model = F2(
- function (data, error) {
- return {data: data, error: error};
+var $author$project$Main$Model = F3(
+ function (data, error, csvdata) {
+ return {csvdata: csvdata, data: data, error: error};
});
var $author$project$Main$DataReceived = function (a) {
return {$: 'DataReceived', a: a};
@@ -6123,11 +6123,11 @@ var $elm$http$Http$get = function (r) {
var $author$project$Main$fetchData = $elm$http$Http$get(
{
expect: $elm$http$Http$expectString($author$project$Main$DataReceived),
- url: 'https://gitlab.informatik.uni-halle.de/akfns/infovisualprojekt/-/raw/master/csv/smartphone_dataset.csv'
+ url: './csv/smartphone_dataset.csv'
});
var $author$project$Main$init = function (_v0) {
return _Utils_Tuple2(
- A2($author$project$Main$Model, _List_Nil, $elm$core$Maybe$Nothing),
+ A3($author$project$Main$Model, _List_Nil, $elm$core$Maybe$Nothing, ''),
$author$project$Main$fetchData);
};
var $elm$core$Platform$Sub$batch = _Platform_batch;
@@ -6188,7 +6188,7 @@ var $author$project$Main$update = F2(
return _Utils_Tuple2(
_Utils_update(
model,
- {data: parsedData, error: $elm$core$Maybe$Nothing}),
+ {csvdata: csvData, data: parsedData, error: $elm$core$Maybe$Nothing}),
$elm$core$Platform$Cmd$none);
} else {
return _Utils_Tuple2(
@@ -6245,7 +6245,14 @@ var $author$project$Main$view = function (model) {
_List_Nil,
A2($elm$core$List$map, $author$project$Main$viewItem, model.data));
}
- }()
+ }(),
+ A2(
+ $elm$html$Html$div,
+ _List_Nil,
+ _List_fromArray(
+ [
+ $elm$html$Html$text(model.csvdata)
+ ]))
]));
};
var $author$project$Main$main = $elm$browser$Browser$element(
diff --git a/src/Main.elm b/src/Main.elm
index 8a3a7bf..160d3d9 100644
--- a/src/Main.elm
+++ b/src/Main.elm
@@ -23,12 +23,13 @@ main =
type alias Model =
{ data : List (Dict String String)
, error : Maybe String
+ , csvdata : String
}
init : () -> ( Model, Cmd Msg )
init _ =
- ( Model [] Nothing, fetchData )
+ ( Model [] Nothing "", fetchData )
@@ -51,7 +52,7 @@ update msg model =
parsedData =
parseCSV csvData
in
- ( { model | data = parsedData, error = Nothing }, Cmd.none )
+ ( { model | data = parsedData, error = Nothing, csvdata = csvData }, Cmd.none )
DataReceived (Err _) ->
( { model | error = Just "Failed to load data" }, Cmd.none )
@@ -70,6 +71,9 @@ view model =
Nothing ->
ul [] (map viewItem model.data)
+ , div []
+ [ text model.csvdata
+ ]
]
@@ -94,8 +98,7 @@ subscriptions _ =
fetchData : Cmd Msg
fetchData =
Http.get
- { -- url = "https://raw.githubusercontent.com/TomS-2000/test/main/smartphone_dataset.csv?token=GHSAT0AAAAAACS6UPFOZ4TYUP45QKFE7PGSZTIIIIA"
- url = "https://gitlab.informatik.uni-halle.de/akfns/infovisualprojekt/-/raw/master/csv/smartphone_dataset.csv"
+ { url = "./csv/smartphone_dataset.csv"
, expect = Http.expectString DataReceived
}
--
GitLab