Skip to content

Commit 8eb6e2c

Browse files
committed
Create uploader and converter
1 parent a20f779 commit 8eb6e2c

File tree

4 files changed

+57
-2
lines changed

4 files changed

+57
-2
lines changed

app/src/main/java/org/bspb/smartbirds/pro/backend/SmartBirdsApi.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,9 @@ public interface SmartBirdsApi {
100100
@POST("bats")
101101
Call<UploadFormResponse> createBat(@Body JsonObject request);
102102

103+
@POST("bears")
104+
Call<UploadFormResponse> createBear(@Body JsonObject request);
105+
103106
@DELETE("user/{id}")
104107
Call<BaseResponse> deleteUser(@Path("id") long id);
105108
}
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package org.bspb.smartbirds.pro.forms.convert
2+
3+
import android.content.Context
4+
import org.bspb.smartbirds.pro.R
5+
6+
class BearsConverter(context: Context?) : Converter(context) {
7+
init {
8+
// Bats main form
9+
addBool(R.string.tag_confidential, "confidential")
10+
addBool(R.string.tag_moderator_review, "moderatorReview")
11+
add(R.string.tag_remarks_type, "speciesNotes")
12+
addMulti(R.string.tag_threats, "threats")
13+
14+
addSpecies(R.string.tag_species_scientific_name, "species")
15+
add(R.string.tag_count, "count", "0")
16+
addSingle(R.string.tag_sex, "sex")
17+
addSingle(R.string.tag_age, "age")
18+
addMulti(R.string.tag_excrement_content, "excrementContent")
19+
addSingle(R.string.tag_excrement_consistence, "excrementConsistence")
20+
add(R.string.tag_marking_height, "markingHeight")
21+
addSingle(R.string.tag_den, "den")
22+
addMulti(R.string.tag_habitat, "habitat")
23+
addMulti(R.string.tag_threats_other, "threatsBears")
24+
addMulti(R.string.tag_findings, "findings")
25+
26+
// Additional fields
27+
add(R.string.tag_footprint_front_paw_width, "footprintFrontPawWidth")
28+
add(R.string.tag_footprint_front_paw_length, "footprintFrontPawLength")
29+
add(R.string.tag_footprint_hind_paw_width, "footprintHindPawWidth")
30+
add(R.string.tag_footprint_hind_paw_length, "footprintHindPawLength")
31+
}
32+
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package org.bspb.smartbirds.pro.forms.upload
2+
3+
import com.google.gson.JsonObject
4+
import org.bspb.smartbirds.pro.backend.SmartBirdsApi
5+
import org.bspb.smartbirds.pro.backend.dto.UploadFormResponse
6+
import retrofit2.Call
7+
8+
class BearsUploader : Uploader {
9+
override fun upload(api: SmartBirdsApi, data: JsonObject): Call<UploadFormResponse> {
10+
return api.createBear(data)
11+
}
12+
}

app/src/main/res/values/headers.xml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,5 +211,13 @@
211211
<string name="tag_tragus" translatable="false">tragus</string>
212212
<string name="tag_upper_molar" translatable="false">upperMolar</string>
213213
<string name="tag_total_length" translatable="false">totalLength</string>
214-
<string name="tag_traps_count" translatable="false">trapsCount</string>s
215-
</resources>
214+
<string name="tag_traps_count" translatable="false">trapsCount</string>
215+
<string name="tag_excrement_content" translatable="false">excrementContent</string>
216+
<string name="tag_excrement_consistence" translatable="false">excrementConsistence</string>
217+
<string name="tag_marking_height" translatable="false">markingHeight</string>
218+
<string name="tag_den" translatable="false">den</string>
219+
<string name="tag_footprint_front_paw_width" translatable="false">footprintFrontPawWidth</string>
220+
<string name="tag_footprint_front_paw_length" translatable="false">footprintFrontPawLength</string>
221+
<string name="tag_footprint_hind_paw_width" translatable="false">footprintHindPawWidth</string>
222+
<string name="tag_footprint_hind_paw_length" translatable="false">footprintHindPawLength</string>
223+
</resources>

0 commit comments

Comments
 (0)