mirror of
https://github.com/hmalik144/DaysLeft.git
synced 2026-01-31 02:41:45 +00:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -332,6 +332,14 @@ public class AddShiftActivity extends AppCompatActivity {
|
|||||||
if(resultCode == Activity.RESULT_OK){
|
if(resultCode == Activity.RESULT_OK){
|
||||||
abnObject = data.getParcelableExtra("AbnObject");
|
abnObject = data.getParcelableExtra("AbnObject");
|
||||||
setEmployerCard();
|
setEmployerCard();
|
||||||
|
|
||||||
|
TaskObject taskObjectRel = data.getParcelableExtra("TaskObject");
|
||||||
|
|
||||||
|
if(taskObjectRel != null){
|
||||||
|
taskObject = taskObjectRel;
|
||||||
|
|
||||||
|
setTaskCard();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (resultCode == Activity.RESULT_CANCELED) {
|
if (resultCode == Activity.RESULT_CANCELED) {
|
||||||
//Write your code if there's no result
|
//Write your code if there's no result
|
||||||
|
|||||||
Reference in New Issue
Block a user