Merged control and menu condition code

The code has been merged, but transference is not fully functioning. Some cleanup is still required.
Ok, I think that's a good approach. We discussed it when you implemented
it, but this worked for the time being. We can go ahead and change it now.


On Wed, Jun 25, 2014 at 1:26 PM, aewong <notifications@github.com> wrote:

> In EMBRACE_Client/EBookImporter.m:
>
> > +                        NSString* stepType = [step name]; //get step type
> > +
> > +                        //All solution step types have at least an obj1Id and action
> > +                        NSString* obj1Id = [[step attributeForName:@"obj1Id"] stringValue];
> > +                        NSString* action = [[step attributeForName:@
> "action"] stringValue];
> > +
> > +                        //Group and ungroup also have an obj2Id
> > +                        //if([[step name] isEqualToString:@"group"] || [[step name] isEqualToString:@"ungroup"]) {
> > +                        if([[step name] isEqualToString:@"group"]) {
> > +                            NSString* obj2Id = [[step attributeForName:@"obj2Id"] stringValue];
> > +
> > +                            NSMutableArray* solutionSteps = [PMSolution solutionSteps];
> > +                            ActionStep* previouslyAddedStep = [solutionSteps lastObject];
> > +
> > +                            if (previouslyAddedStep != nil) {
> > +                                //Assume transference is required if previous step sentence and step number are the same and type was ungroup
>
> I think it's better to encode it in the epub. Instead of changing the step
> type to transferAndGroup as we read them in, maybe we could just write
> transferAndGroup as the step type in the solutions to begin with? Or at
> least add some kind of tag to indicate transference should happen for
> specific steps.
>
> —
> Reply to this email directly or view it on GitHub
> <https://github.com/hcilabasu/EMBRACE-iPad/pull/28/files#r14209941>.
>