The agreement, which still needs approval by the district and union, likely ends a year-long dispute that included threats of a strike.