<div data-ng-init="fields = (field == undefined) ? fieldsRoot : field.children">
  <div data-ng-repeat="row in ::fields | groupBy:'y' | toArray:true | orderBy:minY">
    <div data-ng-repeat="field in row | orderBy:'x'">
      <div id="field-{{field.id}}" data-ng-class="{'nested': !preview}" class="fieldAnswer">
        <div class="fieldTitle">
          <span data-ng-if="!$parent.field && !preview">{{$index + 1}}) {{field.label}}:</span>
          <span data-ng-if="$parent.field || preview">{{field.label}}:</span>
        </div>
        <div data-ng-if="!hasMultipleEntries(fieldAnswers[field.id])">
          <div data-ng-init="entry = fieldAnswers[field.id][0]" data-ng-include="'views/partials/tip_field_answer_entry.html'"></div>
        </div>
        <div data-ng-if="hasMultipleEntries(fieldAnswers[field.id])">
          <div data-ng-repeat="entry in fieldAnswers[field.id]">
            <div class="nested"><span class="text-gray">#{{$index + 1}}</span></div>
            <div class="nested" data-ng-include="'views/partials/tip_field_answer_entry.html'"></div>
          </div>
        </div>
      </div>
    </div>
  </div>
</div>

<div data-ng-init="fields = (field == undefined) ? fieldsRoot : field.children">
  <div data-ng-repeat="field in ::fields | orderBy:['y', 'x']">
    <div id="field-{{field.id}}" data-ng-class="{'nested': !preview}" class="fieldAnswer">
      <div class="fieldTitle">
        <span data-ng-if="!$parent.field && !preview">{{$index + 1}}) {{field.label}}:</span>
        <span data-ng-if="$parent.field || preview">{{field.label}}:</span>
      </div>
      <div data-ng-if="!hasMultipleEntries(fieldAnswers[field.id])">
        <div data-ng-init="entry = fieldAnswers[field.id][0]" data-ng-include="'views/partials/tip_field_answer_entry.html'"></div>
      </div>
      <div data-ng-if="hasMultipleEntries(fieldAnswers[field.id])">
        <div data-ng-repeat="entry in fieldAnswers[field.id]">
          <div class="nested"><span class="text-gray">#{{$index + 1}}</span></div>
          <div class="nested" data-ng-include="'views/partials/tip_field_answer_entry.html'"></div>
        </div>
      </div>
    </div>
  </div>
</div>

Fix numbering of fields answers on tip status page
Fix numbering of fields answers on tip status page
