From 78093e489c199e8bf0bd735bf33d642ada5afb41 Mon Sep 17 00:00:00 2001 From: Mateusz Lubecki Date: Mon, 1 Nov 2021 20:31:30 +0100 Subject: [PATCH] excel export --- .../pogodacc/activity/ExportDataActivity.java | 11 ++++++++++- .../mobile/pogodacc/activity/MainActivity.java | 1 + .../mobile/pogodacc/dao/AllStationsDao.java | 2 ++ .../pogoda/mobile/pogodacc/file/ExcelExport.java | 10 +++++----- .../pogodacc/type/ParceableStationsList.java | 2 ++ .../mobile/pogodacc/type/WeatherStation.java | 15 +++++++++++++++ app/src/main/res/values-en-rUS/strings.xml | 1 + app/src/main/res/values-lv-rLV/strings.xml | 1 + app/src/main/res/values-lv/strings.xml | 1 + app/src/main/res/values-pl-rPL/strings.xml | 1 + app/src/main/res/values-pl/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 12 files changed, 41 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/cc/pogoda/mobile/pogodacc/activity/ExportDataActivity.java b/app/src/main/java/cc/pogoda/mobile/pogodacc/activity/ExportDataActivity.java index 7fe4555..518cb22 100644 --- a/app/src/main/java/cc/pogoda/mobile/pogodacc/activity/ExportDataActivity.java +++ b/app/src/main/java/cc/pogoda/mobile/pogodacc/activity/ExportDataActivity.java @@ -259,7 +259,7 @@ public class ExportDataActivity extends AppCompatActivity { } - else { + else if (toExport == null) { AlertDialog.Builder builder = new AlertDialog.Builder(act); builder.setMessage(R.string.select_station_export); builder.setPositiveButton(R.string.ok, (DialogInterface var1, int var2) -> { @@ -268,6 +268,15 @@ public class ExportDataActivity extends AppCompatActivity { builder.create(); builder.show(); } + else { + AlertDialog.Builder builder = new AlertDialog.Builder(act); + builder.setMessage(R.string.select_output_file); + builder.setPositiveButton(R.string.ok, (DialogInterface var1, int var2) -> { + var1.dismiss(); + }); + builder.create(); + builder.show(); + } } }); diff --git a/app/src/main/java/cc/pogoda/mobile/pogodacc/activity/MainActivity.java b/app/src/main/java/cc/pogoda/mobile/pogodacc/activity/MainActivity.java index d94850e..d602e62 100644 --- a/app/src/main/java/cc/pogoda/mobile/pogodacc/activity/MainActivity.java +++ b/app/src/main/java/cc/pogoda/mobile/pogodacc/activity/MainActivity.java @@ -95,6 +95,7 @@ public class MainActivity extends AppCompatActivity { fromFavs.setDisplayedName(fromAllStations.getDisplayedName()); fromFavs.setDisplayedLocation(fromAllStations.getDisplayedLocation()); fromFavs.setTimezone(fromAllStations.getTimezone()); + fromFavs.setCallsignSsid(fromAllStations.getCallsignSsid()); // there is no need to delete and put object on the list once again // as a list does not make a copy of the object. It (ArrayList) keeps diff --git a/app/src/main/java/cc/pogoda/mobile/pogodacc/dao/AllStationsDao.java b/app/src/main/java/cc/pogoda/mobile/pogodacc/dao/AllStationsDao.java index 2c13731..8863361 100644 --- a/app/src/main/java/cc/pogoda/mobile/pogodacc/dao/AllStationsDao.java +++ b/app/src/main/java/cc/pogoda/mobile/pogodacc/dao/AllStationsDao.java @@ -67,6 +67,8 @@ public class AllStationsDao { elem.setImageAlign(def.backgroundJpgAlign); elem.setMoreInfo(def.moreInfo); elem.setTimezone(def.timezone); + elem.setCallsignSsid(def.callsign, def.ssid); + AvailableParameters availableParameters = AvailableParameters.fromStation(def); elem.setAvailableParameters(availableParameters); diff --git a/app/src/main/java/cc/pogoda/mobile/pogodacc/file/ExcelExport.java b/app/src/main/java/cc/pogoda/mobile/pogodacc/file/ExcelExport.java index 8f30bd8..c724a53 100644 --- a/app/src/main/java/cc/pogoda/mobile/pogodacc/file/ExcelExport.java +++ b/app/src/main/java/cc/pogoda/mobile/pogodacc/file/ExcelExport.java @@ -103,11 +103,11 @@ public class ExcelExport { off = offset.createCell(1); off.setCellValue(first.getOffset().toString()); -// Row aprscall = sheet.createRow(rowNumber++); -// Cell call = aprscall.createCell(0); -// call.setCellValue("APRS Callsign:"); -// call = aprscall.createCell(1); -// call.setCellValue(station.get); + Row aprscall = sheet.createRow(rowNumber++); + Cell call = aprscall.createCell(0); + call.setCellValue("APRS Callsign:"); + call = aprscall.createCell(1); + call.setCellValue(station.getCallsignSsid()); } rowNumber++; diff --git a/app/src/main/java/cc/pogoda/mobile/pogodacc/type/ParceableStationsList.java b/app/src/main/java/cc/pogoda/mobile/pogodacc/type/ParceableStationsList.java index e4b349c..94bf548 100644 --- a/app/src/main/java/cc/pogoda/mobile/pogodacc/type/ParceableStationsList.java +++ b/app/src/main/java/cc/pogoda/mobile/pogodacc/type/ParceableStationsList.java @@ -57,6 +57,7 @@ public class ParceableStationsList implements Parcelable { parcel.writeString(s.getSponsorUrl()); parcel.writeString(s.getImageUrl()); parcel.writeString(s.getTimezone()); + parcel.writeString(s.getCallsignSsid()); parcel.writeInt(s.getImageAlign()); parcel.writeInt(s.getStationNameTextColor()); @@ -92,6 +93,7 @@ public class ParceableStationsList implements Parcelable { wx.sponsorUrl = in.readString(); wx.imageUrl = in.readString(); wx.timezone = in.readString(); + wx.callsignSsid = in.readString(); wx.imageAlign = in.readInt(); wx.stationNameTextColor = in.readInt(); diff --git a/app/src/main/java/cc/pogoda/mobile/pogodacc/type/WeatherStation.java b/app/src/main/java/cc/pogoda/mobile/pogodacc/type/WeatherStation.java index fc999a4..3b5fc8b 100644 --- a/app/src/main/java/cc/pogoda/mobile/pogodacc/type/WeatherStation.java +++ b/app/src/main/java/cc/pogoda/mobile/pogodacc/type/WeatherStation.java @@ -126,6 +126,21 @@ public class WeatherStation implements Serializable { String displayedLocation; + public String getCallsignSsid() { + return callsignSsid; + } + + public void setCallsignSsid(String callsign, int ssid) { + if (ssid < 16) + this.callsignSsid = callsign + "-" + ssid; + } + + public void setCallsignSsid(String callsignSsid) { + this.callsignSsid = callsignSsid; + } + + String callsignSsid; + String sponsorUrl; String imageUrl; diff --git a/app/src/main/res/values-en-rUS/strings.xml b/app/src/main/res/values-en-rUS/strings.xml index 31006b2..eee5dd2 100644 --- a/app/src/main/res/values-en-rUS/strings.xml +++ b/app/src/main/res/values-en-rUS/strings.xml @@ -107,4 +107,5 @@ Since the station installation Data sources APRS callsign + Select output file \ No newline at end of file diff --git a/app/src/main/res/values-lv-rLV/strings.xml b/app/src/main/res/values-lv-rLV/strings.xml index 9fdc7c8..cbe8914 100644 --- a/app/src/main/res/values-lv-rLV/strings.xml +++ b/app/src/main/res/values-lv-rLV/strings.xml @@ -107,4 +107,5 @@ No brīža, kad stacija uzstādīta Datu avoti APRS izsaukuma signāls + Atlasīt izejas fails diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index 9fdc7c8..cbe8914 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -107,4 +107,5 @@ No brīža, kad stacija uzstādīta Datu avoti APRS izsaukuma signāls + Atlasīt izejas fails diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml index 0e58449..5fd82a6 100644 --- a/app/src/main/res/values-pl-rPL/strings.xml +++ b/app/src/main/res/values-pl-rPL/strings.xml @@ -107,4 +107,5 @@ Od instalacji stacji Źródła danych Znak wywoławczy w APRS + Wybierz plik wyjściowy \ No newline at end of file diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index a9d56af..5466ee8 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -107,4 +107,5 @@ Od instalacji stacji Źródła danych Znak wywoławczy w APRS + Wybierz plik wyjściowy \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d686fad..ff6067b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -126,4 +126,5 @@ @string/csv @string/xlsx + Select output file \ No newline at end of file