kopia lustrzana https://github.com/SP8EBC/MeteoSystem
excel export
Mateusz Lubecki
rodzic
42256bf457
commit
78093e489c
|
|
@ -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();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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++;
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -107,4 +107,5 @@
|
|||
<string name="ever">Since the station installation</string>
|
||||
<string name="data_sources">Data sources</string>
|
||||
<string name="callsign">APRS callsign</string>
|
||||
<string name="select_output_file">Select output file</string>
|
||||
</resources>
|
||||
|
|
@ -107,4 +107,5 @@
|
|||
<string name="ever">No brīža, kad stacija uzstādīta</string>
|
||||
<string name="data_sources">Datu avoti</string>
|
||||
<string name="callsign">APRS izsaukuma signāls</string>
|
||||
<string name="select_output_file">Atlasīt izejas fails</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -107,4 +107,5 @@
|
|||
<string name="ever">No brīža, kad stacija uzstādīta</string>
|
||||
<string name="data_sources">Datu avoti</string>
|
||||
<string name="callsign">APRS izsaukuma signāls</string>
|
||||
<string name="select_output_file">Atlasīt izejas fails</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -107,4 +107,5 @@
|
|||
<string name="ever">Od instalacji stacji</string>
|
||||
<string name="data_sources">Źródła danych</string>
|
||||
<string name="callsign">Znak wywoławczy w APRS</string>
|
||||
<string name="select_output_file">Wybierz plik wyjściowy</string>
|
||||
</resources>
|
||||
|
|
@ -107,4 +107,5 @@
|
|||
<string name="ever">Od instalacji stacji</string>
|
||||
<string name="data_sources">Źródła danych</string>
|
||||
<string name="callsign">Znak wywoławczy w APRS</string>
|
||||
<string name="select_output_file">Wybierz plik wyjściowy</string>
|
||||
</resources>
|
||||
|
|
@ -126,4 +126,5 @@
|
|||
<item>@string/csv</item>
|
||||
<item>@string/xlsx</item>
|
||||
</string-array>
|
||||
<string name="select_output_file">Select output file</string>
|
||||
</resources>
|
||||
Ładowanie…
Reference in New Issue