Skip to content

Commit

Permalink
Merge pull request #1148 from PhenoApps/bugs_v6.0.5
Browse files Browse the repository at this point in the history 
bugs_v6.0.5
  • Loading branch information
@trife
trife authored Jan 24, 2025
2 parents ee6edbd + 87c77c1 commit aeb53ab
Show file tree
Hide file tree
Showing 8 changed files with 122 additions and 76 deletions.
6 changes: 5 additions & 1 deletion app/src/main/java/com/fieldbook/tracker/activities/FieldEditorActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,11 @@ public void onDestroyActionMode(ActionMode mode) {
};

public void setActiveField(int studyId) {
FieldObject field = database.getFieldObject(studyId);

//get current field id and compare the input, only switch if they are different
int currentFieldId = preferences.getInt(GeneralKeys.SELECTED_FIELD_ID, -1);
if (currentFieldId == studyId) return;

fieldSwitcher.switchField(studyId);
CollectActivity.reloadData = true;
if (mAdapter != null) {
Expand Down
86 changes: 47 additions & 39 deletions app/src/main/java/com/fieldbook/tracker/activities/FileExploreActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,48 +117,56 @@ class FileExploreActivity : ActivityDialog(), CoroutineScope by MainScope() {

mainListView?.onItemClickListener =
AdapterView.OnItemClickListener { _: AdapterView<*>?, _: View?, which: Int, _: Long ->
chosenFile = fileList[which].file
//File sel = new File(path + "/" + chosenFile);
val file = path?.findFile(chosenFile!!)
if (file != null && file.exists() && file.isDirectory) {
firstLvl = false

// Adds chosen directory to list
str.add(chosenFile)
fileList.clear()
path = file

loadFilesProgress(file, exclude, include)

} else if (chosenFile.equals(getString(R.string.activity_file_explorer_up_directory_name))
&& (file == null || !file.exists())
) {
// present directory removed from list
str.removeAt(str.size - 1)

// path modified to exclude present directory
path = path?.parentFile

fileList.clear()

// if there are no more directories in the list, then
// its the first level
if (str.isEmpty()) {
firstLvl = true
}

loadFilesProgress(path, exclude, include)
launch(Dispatchers.IO) {

chosenFile = fileList[which].file
//File sel = new File(path + "/" + chosenFile);
val file = path?.findFile(chosenFile!!)
if (file != null && file.exists() && file.isDirectory) {
firstLvl = false

// Adds chosen directory to list
str.add(chosenFile)
fileList.clear()
path = file

withContext(Dispatchers.Main) {
loadFilesProgress(file, exclude, include)
}

} else if (chosenFile.equals(getString(R.string.activity_file_explorer_up_directory_name))
&& (file == null || !file.exists())
) {
// present directory removed from list
str.removeAt(str.size - 1)

// path modified to exclude present directory
path = path?.parentFile

fileList.clear()

// if there are no more directories in the list, then
// its the first level
if (str.isEmpty()) {
firstLvl = true
}

withContext(Dispatchers.Main) {
loadFilesProgress(path, exclude, include)
}

} else {
try {
if (file != null && file.exists()) {
val returnIntent = Intent()
returnIntent.putExtra(EXTRA_RESULT_KEY, file.uri.toString())
setResult(RESULT_OK, returnIntent)
finish()
} else {
try {
if (file != null && file.exists()) {
val returnIntent = Intent()
returnIntent.putExtra(EXTRA_RESULT_KEY, file.uri.toString())
setResult(RESULT_OK, returnIntent)
finish()
}
} catch (e: Exception) {
e.printStackTrace()
}
} catch (e: Exception) {
e.printStackTrace()
}
}
}
Expand Down
45 changes: 27 additions & 18 deletions app/src/main/java/com/fieldbook/tracker/activities/brapi/BrapiExportActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -831,33 +831,42 @@ private void moveToNextField() {
}

private void showExportButton() {
Button exportButton = findViewById(R.id.brapi_export_btn);
Button nextFieldButton = findViewById(R.id.next_field_btn);
Button closeButton = findViewById(R.id.close_btn);

exportButton.setVisibility(View.VISIBLE);
nextFieldButton.setVisibility(View.GONE);
closeButton.setVisibility(View.GONE);
runOnUiThread(() -> {
Button exportButton = findViewById(R.id.brapi_export_btn);
Button nextFieldButton = findViewById(R.id.next_field_btn);
Button closeButton = findViewById(R.id.close_btn);

exportButton.setVisibility(View.VISIBLE);
nextFieldButton.setVisibility(View.GONE);
closeButton.setVisibility(View.GONE);
});
}

private void showNextFieldButton() {
Button exportButton = findViewById(R.id.brapi_export_btn);
Button nextFieldButton = findViewById(R.id.next_field_btn);
Button closeButton = findViewById(R.id.close_btn);

exportButton.setVisibility(View.GONE);
nextFieldButton.setVisibility(View.VISIBLE);
closeButton.setVisibility(View.GONE);
runOnUiThread(() -> {
Button exportButton = findViewById(R.id.brapi_export_btn);
Button nextFieldButton = findViewById(R.id.next_field_btn);
Button closeButton = findViewById(R.id.close_btn);

exportButton.setVisibility(View.GONE);
nextFieldButton.setVisibility(View.VISIBLE);
closeButton.setVisibility(View.GONE);
});
}

private void showCloseButton() {
Button exportButton = findViewById(R.id.brapi_export_btn);
Button nextFieldButton = findViewById(R.id.next_field_btn);
Button closeButton = findViewById(R.id.close_btn);

exportButton.setVisibility(View.GONE);
nextFieldButton.setVisibility(View.GONE);
closeButton.setVisibility(View.VISIBLE);
runOnUiThread(() -> {
Button exportButton = findViewById(R.id.brapi_export_btn);
Button nextFieldButton = findViewById(R.id.next_field_btn);
Button closeButton = findViewById(R.id.close_btn);

exportButton.setVisibility(View.GONE);
nextFieldButton.setVisibility(View.GONE);
closeButton.setVisibility(View.VISIBLE);
});
}

public enum UploadError {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/fieldbook/tracker/activities/brapi/io/BrapiStudyImportActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ class BrapiStudyImportActivity : ThemedActivity(), CoroutineScope by MainScope()
attributesTable?.get(study.studyDbId)?.let { studyAttributes ->

observationUnits[study.studyDbId]?.filter {
if (it.observationUnitPosition.entryType.name == "TEST") true
if (it.observationUnitPosition?.entryType?.name == "TEST") true
else it.observationUnitPosition.observationLevel.levelName == level.observationLevelName
}
?.let { units ->
Expand Down
15 changes: 12 additions & 3 deletions app/src/main/java/com/fieldbook/tracker/brapi/BrapiLoadDialog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,10 @@ private void loadStudy() {
primary.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> adapterView, View view, int index, long id) {
selectedPrimary = studyDetails.getAttributes().get(index);
List<String> attrs = studyDetails.getAttributes();
if (attrs != null && !attrs.isEmpty() && index < attrs.size()) {
selectedPrimary = attrs.get(index);
}
}

@Override
Expand All @@ -341,7 +344,10 @@ public void onNothingSelected(AdapterView<?> adapterView) {
secondary.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> adapterView, View view, int index, long id) {
selectedSecondary = studyDetails.getAttributes().get(index);
List<String> attrs = studyDetails.getAttributes();
if (attrs != null && !attrs.isEmpty() && index < attrs.size()) {
selectedSecondary = attrs.get(index);
}
}

@Override
Expand All @@ -355,7 +361,10 @@ public void onNothingSelected(AdapterView<?> adapterView) {
sort.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> adapterView, View view, int index, long id) {
selectedSort = studyDetails.getAttributes().get(index);
List<String> attrs = studyDetails.getAttributes();
if (attrs != null && !attrs.isEmpty() && index < attrs.size()) {
selectedSort = attrs.get(index);
}
}

@Override
Expand Down
12 changes: 9 additions & 3 deletions app/src/main/java/com/fieldbook/tracker/database/dao/ObservationUnitPropertyDao.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,19 +318,25 @@ class ObservationUnitPropertyDao {

getExportTableData(context, expId, traits)?.use { cursor ->

val requiredColumns = arrayOf(uniqueName) + traits.map { it.name }.toTypedArray()
val requiredTraits = traits.map { it.name }.toTypedArray()
val requiredColumns = arrayOf(uniqueName) + requiredTraits
val matrixCursor = MatrixCursor(requiredColumns)
val traitStartIndex = cursor.columnCount - requiredTraits.size

while (cursor.moveToNext()) {

val rowData = mutableListOf<String?>()

requiredColumns.forEachIndexed { index, s ->
//add the unique id
rowData.add(cursor.getStringOrNull(0))

//skip ahead to the traits and add all trait values
requiredTraits.forEachIndexed { index, s ->

try {

rowData.add(
cursor.getStringOrNull(index)
cursor.getStringOrNull(index + traitStartIndex)
)

} catch (e: Exception) {
Expand Down
8 changes: 6 additions & 2 deletions app/src/main/java/com/fieldbook/tracker/utilities/ExportUtil.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,14 @@ class ExportUtil @Inject constructor(@ActivityContext private val context: Conte
val perms = arrayOf(Manifest.permission.READ_EXTERNAL_STORAGE)

if (EasyPermissions.hasPermissions(context, *perms) || Build.VERSION.SDK_INT > Build.VERSION_CODES.P) {
if (fieldIds.isNotEmpty()) {

exportLocal(fieldIds.mapNotNull { database.getFieldObject(it) })
val fieldsToExport = fieldIds.mapNotNull { database.getFieldObject(it) }

if (fieldsToExport.isNotEmpty()) {

exportLocal(fieldsToExport)
}

} else {
EasyPermissions.requestPermissions(
context as Activity,
Expand Down
24 changes: 15 additions & 9 deletions app/src/main/java/com/fieldbook/tracker/views/RangeBoxView.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package com.fieldbook.tracker.views
import android.app.Service
import android.content.Context
import android.content.SharedPreferences
import android.database.sqlite.SQLiteException
import android.database.Cursor
import android.os.Handler
import android.text.Editable
import android.text.TextWatcher
Expand All @@ -22,14 +22,11 @@ import android.widget.TextView
import android.widget.Toast
import androidx.constraintlayout.widget.ConstraintLayout
import com.fieldbook.tracker.R
import com.fieldbook.tracker.activities.CollectActivity
import com.fieldbook.tracker.interfaces.CollectRangeController
import com.fieldbook.tracker.objects.RangeObject
import com.fieldbook.tracker.objects.TraitObject
import com.fieldbook.tracker.preferences.GeneralKeys
import com.fieldbook.tracker.utilities.Utils
import com.google.firebase.crashlytics.CustomKeysAndValues
import com.google.firebase.crashlytics.FirebaseCrashlytics
import java.util.*

class RangeBoxView : ConstraintLayout {
Expand Down Expand Up @@ -80,6 +77,8 @@ class RangeBoxView : ConstraintLayout {
private var delay = 100
private var count = 1

private var exportDataCursor: Cursor? = null

init {

val v = inflate(context, R.layout.view_range_box, this)
Expand All @@ -105,6 +104,9 @@ class RangeBoxView : ConstraintLayout {
firstName = controller.getPreferences().getString(GeneralKeys.PRIMARY_NAME, "") ?: ""
secondName = controller.getPreferences().getString(GeneralKeys.SECONDARY_NAME, "") ?: ""
uniqueName = controller.getPreferences().getString(GeneralKeys.UNIQUE_NAME, "") ?: ""

refreshCursor()

}

constructor(ctx: Context) : super(ctx)
Expand Down Expand Up @@ -631,13 +633,10 @@ class RangeBoxView : ConstraintLayout {
}

private fun moveToNextUncollectedObs(currentPos: Int, direction: Int, traits: ArrayList<TraitObject>): Int {
val studyId = controller.getPreferences().getInt(GeneralKeys.SELECTED_FIELD_ID, 0)
val study = controller.getDatabase().getFieldObject(studyId)
val cursor = controller.getDatabase().getExportTableDataShort(studyId, study.unique_id, traits)

val traitNames = traits.map { it.name }

cursor?.use {
exportDataCursor?.use { cursor ->
// Convert one-based range position to zero-based cursor position
val zeroBasedPos = currentPos - 1
cursor.moveToPosition(zeroBasedPos)
Expand Down Expand Up @@ -675,7 +674,6 @@ class RangeBoxView : ConstraintLayout {
return pos
}
}

}
}
}
Expand Down Expand Up @@ -716,4 +714,12 @@ class RangeBoxView : ConstraintLayout {
fun clickRight() {
rangeRight.performClick()
}

fun refreshCursor() {
exportDataCursor?.close()
val studyId = controller.getPreferences().getInt(GeneralKeys.SELECTED_FIELD_ID, 0)
val uniqueName = controller.getPreferences().getString(GeneralKeys.UNIQUE_NAME, "") ?: ""
val traits = controller.getDatabase().visibleTraitObjects
exportDataCursor = controller.getDatabase().getExportTableDataShort(studyId, uniqueName, traits)
}
}

0 comments on commit aeb53ab

Please sign in to comment.