Author: kmorin Date: 2014-03-11 12:04:05 +0100 (Tue, 11 Mar 2014) New Revision: 72 Url: http://forge.codelutin.com/projects/wlo/repository/revisions/72 Log: fixes #4682 [POIDS] Le poids total d?\195?\169barqu?\195?\169 ne s'affiche pas quand on quitte et retourne sur l'?\195?\169cran Modified: trunk/res/layout/commercial_species_list_item.xml trunk/res/layout/location_list_item.xml trunk/src/fr/ifremer/wlo/ScientificSpeciesActivity.java trunk/src/fr/ifremer/wlo/WeightsActivity.java Modified: trunk/res/layout/commercial_species_list_item.xml =================================================================== --- trunk/res/layout/commercial_species_list_item.xml 2014-03-11 10:48:25 UTC (rev 71) +++ trunk/res/layout/commercial_species_list_item.xml 2014-03-11 11:04:05 UTC (rev 72) @@ -11,7 +11,7 @@ <TextView android:id="@+id/commercial_species_fao_code" android:text="@string/undefined" - android:textSize="20sp" + android:textSize="19sp" android:layout_marginLeft="5dp" android:layout_width="wrap_content" android:layout_height="wrap_content"/> Modified: trunk/res/layout/location_list_item.xml =================================================================== --- trunk/res/layout/location_list_item.xml 2014-03-11 10:48:25 UTC (rev 71) +++ trunk/res/layout/location_list_item.xml 2014-03-11 11:04:05 UTC (rev 72) @@ -11,7 +11,7 @@ <TextView android:id="@+id/location_location" android:text="@string/undefined" - android:textSize="20sp" + android:textSize="19sp" android:layout_marginLeft="5dp" android:layout_width="wrap_content" android:layout_height="wrap_content"/> Modified: trunk/src/fr/ifremer/wlo/ScientificSpeciesActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/ScientificSpeciesActivity.java 2014-03-11 10:48:25 UTC (rev 71) +++ trunk/src/fr/ifremer/wlo/ScientificSpeciesActivity.java 2014-03-11 11:04:05 UTC (rev 72) @@ -35,6 +35,7 @@ import android.widget.ListView; import com.google.common.collect.Maps; import fr.ifremer.wlo.measurement.MeasurementActivity; +import fr.ifremer.wlo.models.BaseModel; import fr.ifremer.wlo.models.CommercialSpeciesModel; import fr.ifremer.wlo.models.ScientificSpeciesModel; import fr.ifremer.wlo.utils.WloItemListViewBinder; @@ -49,6 +50,8 @@ private static final String TAG = "ScientificSpeciesActivity"; + protected static final int REQUEST_EDIT_WEIGHTS = 0; + @Override protected SimpleCursorAdapter createAdapter() { return new SimpleCursorAdapter(this, android.R.layout.simple_list_item_1, null, @@ -83,8 +86,9 @@ switch (item.getItemId()) { case R.id.weights: Intent intent = new Intent(this, WeightsActivity.class); + Log.d(TAG, "getTotalUnloadedWeight " + ((CommercialSpeciesModel) parentModel).getTotalUnloadedWeight()); intent.putExtra(WeightsActivity.INTENT_COMMERCIAL_SPECIES, parentModel); - startActivity(intent); + startActivityForResult(intent, REQUEST_EDIT_WEIGHTS); return true; } return super.onOptionsItemSelected(item); @@ -128,4 +132,14 @@ types.put(1, WloItemListViewBinder.DataType.SCIENTIFIC_SPECIES); return new WloItemListViewBinder(this, types); } + + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + if (requestCode == REQUEST_EDIT_WEIGHTS && resultCode == RESULT_OK) { + getIntent().putExtra(INTENT_EXTRA_PARENT_MODEL, data.getSerializableExtra(WeightsActivity.INTENT_COMMERCIAL_SPECIES)); + + } else { + super.onActivityResult(requestCode, resultCode, data); + } + } } \ No newline at end of file Modified: trunk/src/fr/ifremer/wlo/WeightsActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/WeightsActivity.java 2014-03-11 10:48:25 UTC (rev 71) +++ trunk/src/fr/ifremer/wlo/WeightsActivity.java 2014-03-11 11:04:05 UTC (rev 72) @@ -247,6 +247,9 @@ public void validate(View view) { saveModel(); + Intent intent = new Intent(); + intent.putExtra(INTENT_COMMERCIAL_SPECIES, commercialSpeciesModel); + setResult(RESULT_OK, intent); finish(); }