Merge remote-tracking branch 'origin/master'

This commit is contained in:
2019-06-27 18:34:28 +10:00

View File

@@ -332,6 +332,14 @@ public class AddShiftActivity extends AppCompatActivity {
if(resultCode == Activity.RESULT_OK){
abnObject = data.getParcelableExtra("AbnObject");
setEmployerCard();
TaskObject taskObjectRel = data.getParcelableExtra("TaskObject");
if(taskObjectRel != null){
taskObject = taskObjectRel;
setTaskCard();
}
}
if (resultCode == Activity.RESULT_CANCELED) {
//Write your code if there's no result