Author: kmorin Date: 2014-01-28 22:37:56 +0100 (Tue, 28 Jan 2014) New Revision: 38 Url: http://forge.codelutin.com/projects/wlo/repository/revisions/38 Log: fixes #4241 ?\195?\169cran des tailles, ajouter le nombre total d'individus mesur?\195?\169 Modified: trunk/AndroidManifest.xml trunk/res/layout/measurement.xml trunk/res/values-fr/strings.xml trunk/res/values/strings.xml trunk/src/fr/ifremer/wlo/WloModelEditionActivity.java trunk/src/fr/ifremer/wlo/measurement/MeasurementActivity.java Modified: trunk/AndroidManifest.xml =================================================================== --- trunk/AndroidManifest.xml 2014-01-28 21:06:06 UTC (rev 37) +++ trunk/AndroidManifest.xml 2014-01-28 21:37:56 UTC (rev 38) @@ -51,7 +51,8 @@ <activity android:name=".MainActivity" android:label="@string/app_name" - android:configChanges="orientation|keyboardHidden"> + android:configChanges="orientation|keyboardHidden" + android:launchMode="singleInstance"> <intent-filter> <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.LAUNCHER"/> Modified: trunk/res/layout/measurement.xml =================================================================== --- trunk/res/layout/measurement.xml 2014-01-28 21:06:06 UTC (rev 37) +++ trunk/res/layout/measurement.xml 2014-01-28 21:37:56 UTC (rev 38) @@ -126,6 +126,31 @@ </FrameLayout> + <View android:layout_width="match_parent" + android:layout_height="2px" + android:background="@android:color/holo_blue_light"/> + + <LinearLayout android:id="@+id/fragment_placeholder" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:padding="2dp"> + + <TextView android:text="@string/observed_number" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textStyle="italic" + android:paddingLeft="5dp" + android:paddingRight="5dp"/> + + <TextView android:id="@+id/observed_number" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textStyle="bold" + android:text='0'/> + + </LinearLayout> + </LinearLayout> </TabHost> Modified: trunk/res/values/strings.xml =================================================================== --- trunk/res/values/strings.xml 2014-01-28 21:06:06 UTC (rev 37) +++ trunk/res/values/strings.xml 2014-01-28 21:37:56 UTC (rev 38) @@ -65,6 +65,8 @@ <string name="undefined">Undefined</string> + <string name="observed_number">Number of individuals observed:</string> + <!-- Home screen --> <string name="main_open_contexts">Watch/Input data</string> <string name="main_export_data">Export data</string> Modified: trunk/res/values-fr/strings.xml =================================================================== --- trunk/res/values-fr/strings.xml 2014-01-28 21:06:06 UTC (rev 37) +++ trunk/res/values-fr/strings.xml 2014-01-28 21:37:56 UTC (rev 38) @@ -61,6 +61,8 @@ <string name="undefined">Non défini</string> + <string name="observed_number">Nombre d\'individus observés :</string> + <!-- Home screen --> <string name="main_open_contexts">Voir / saisir des données</string> <string name="main_export_data">Export des données</string> Modified: trunk/src/fr/ifremer/wlo/WloModelEditionActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/WloModelEditionActivity.java 2014-01-28 21:06:06 UTC (rev 37) +++ trunk/src/fr/ifremer/wlo/WloModelEditionActivity.java 2014-01-28 21:37:56 UTC (rev 38) @@ -160,6 +160,7 @@ saveModel(); if (newModel) { + Intent intent = new Intent(this, getNextEditionActivity()); intent.putExtra(WloModelEditionActivity.INTENT_EXTRA_PARENT_MODEL, model); startActivity(intent); Modified: trunk/src/fr/ifremer/wlo/measurement/MeasurementActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/measurement/MeasurementActivity.java 2014-01-28 21:06:06 UTC (rev 37) +++ trunk/src/fr/ifremer/wlo/measurement/MeasurementActivity.java 2014-01-28 21:37:56 UTC (rev 38) @@ -101,6 +101,7 @@ protected TabHost tabs; protected EditText sizeText; protected ActionBarDrawerToggle mDrawerToggle; + protected TextView observedNumberText; protected MeasurementModel measurement; protected MeasurementsModel measurements; @@ -152,11 +153,15 @@ measurements.addMeasurementsListener(new MeasurementsModel.MeasurementsListener() { @Override public void onMeasurementAdded(MeasurementsModel source, MeasurementModel measurement) { + int size = source.getMeasurements().size(); + observedNumberText.setText(String.valueOf(size)); } @Override public void onMeasurementRemoved(MeasurementsModel source, MeasurementModel measurement) { soh.deleteMeasurement(measurement); + int size = source.getMeasurements().size(); + observedNumberText.setText(String.valueOf(size)); } }); @@ -203,21 +208,27 @@ } }); + observedNumberText = (TextView) findViewById(R.id.observed_number); + observedNumberText.setText(String.valueOf(measurements.getMeasurements().size())); + Spinner genderSpinner = (Spinner) findViewById(R.id.gender_spinner); genderSpinner.setOnItemSelectedListener(this); List<Gender> genders = Lists.newArrayList(DataCache.getAllGenders(this)); + genders.add(0, null); ArrayAdapter<Gender> gendersAdapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, genders); genderSpinner.setAdapter(gendersAdapter); Spinner maturitySpinner = (Spinner) findViewById(R.id.maturity_spinner); maturitySpinner.setOnItemSelectedListener(this); List<Maturity> maturities = Lists.newArrayList(DataCache.getAllMaturities(this)); + maturities.add(0, null); ArrayAdapter<Maturity> maturitiesAdapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, maturities); maturitySpinner.setAdapter(maturitiesAdapter); Spinner ageSpinner = (Spinner) findViewById(R.id.age_spinner); ageSpinner.setOnItemSelectedListener(this); List<Age> ages = Lists.newArrayList(DataCache.getAllAges(this)); + ages.add(0, null); ArrayAdapter<Age> agesAdapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_item, ages); ageSpinner.setAdapter(agesAdapter); @@ -310,15 +321,16 @@ @Override public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) { BaseModel selected = (BaseModel) adapterView.getItemAtPosition(i); + String id = selected != null ? selected.getId() : null; switch(adapterView.getId()) { case R.id.gender_spinner: - measurement.setCategory1(selected.getId()); + measurement.setCategory1(id); break; case R.id.maturity_spinner: - measurement.setCategory2(selected.getId()); + measurement.setCategory2(id); break; case R.id.age_spinner: - measurement.setCategory3(selected.getId()); + measurement.setCategory3(id); break; } }